diff --git a/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/LineaTransactionSelector.java b/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/LineaTransactionSelector.java index 6de452dabc..f6125e614d 100644 --- a/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/LineaTransactionSelector.java +++ b/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/LineaTransactionSelector.java @@ -31,8 +31,8 @@ @Slf4j public class LineaTransactionSelector implements PluginTransactionSelector { - private static TraceLineLimitTransactionSelector traceLineLimitTransactionSelector; - List selectors; + private TraceLineLimitTransactionSelector traceLineLimitTransactionSelector; + private List selectors; public LineaTransactionSelector( LineaTransactionSelectorConfiguration lineaConfiguration, @@ -47,7 +47,7 @@ public LineaTransactionSelector( * @param limitsMapSupplier The supplier for the limits map. * @return A list of selectors. */ - private static List createTransactionSelectors( + private List createTransactionSelectors( final LineaTransactionSelectorConfiguration lineaConfiguration, final Supplier> limitsMapSupplier) { diff --git a/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/ProfitableTransactionSelector.java b/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/ProfitableTransactionSelector.java index 43132eaabb..db285bf082 100644 --- a/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/ProfitableTransactionSelector.java +++ b/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/ProfitableTransactionSelector.java @@ -69,7 +69,7 @@ public TransactionSelectionResult evaluateTransactionPostProcessing( if (margin < minMargin) { log( - log.atInfo(), + log.atDebug(), transaction, margin, effectiveGasPrice, diff --git a/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java b/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java index 61e7abbc4b..0902bc6533 100644 --- a/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java +++ b/arithmetization/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java @@ -47,7 +47,7 @@ public class TraceLineLimitTransactionSelector implements PluginTransactionSelec private final ZkTracer zkTracer; private final String limitFilePath; private final Map moduleLimits; - private Map prevCumulatedLineCount = Map.of(); + private Map consolidatedCumulatedLineCount = Map.of(); private Map currCumulatedLineCount; public TraceLineLimitTransactionSelector( @@ -81,7 +81,7 @@ public void onTransactionNotSelected( public void onTransactionSelected( final TransactionEvaluationContext evaluationContext, final TransactionProcessingResult processingResult) { - prevCumulatedLineCount = currCumulatedLineCount; + consolidatedCumulatedLineCount = currCumulatedLineCount; } /** @@ -120,7 +120,7 @@ public TransactionSelectionResult evaluateTransactionPostProcessing( final int cumulatedModuleLineCount = currCumulatedLineCount.get(module); final int txModuleLineCount = - cumulatedModuleLineCount - prevCumulatedLineCount.getOrDefault(module, 0); + cumulatedModuleLineCount - consolidatedCumulatedLineCount.getOrDefault(module, 0); if (txModuleLineCount > moduleLineCountLimit) { log.warn( @@ -158,7 +158,7 @@ private String logTxLineCount() { // tx line count / cumulated line count / line count limit e.getKey() + "=" - + (e.getValue() - prevCumulatedLineCount.getOrDefault(e.getKey(), 0)) + + (e.getValue() - consolidatedCumulatedLineCount.getOrDefault(e.getKey(), 0)) + "/" + e.getValue() + "/" @@ -177,12 +177,10 @@ public void traceEndBlock(final BlockHeader blockHeader, final BlockBody blockBo .addKeyValue( "traceCounts", () -> - currCumulatedLineCount == null - ? "null" - : currCumulatedLineCount.entrySet().stream() - .sorted(Map.Entry.comparingByKey()) - .map(e -> '"' + e.getKey() + "\":" + e.getValue()) - .collect(Collectors.joining(","))) + consolidatedCumulatedLineCount.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .map(e -> '"' + e.getKey() + "\":" + e.getValue()) + .collect(Collectors.joining(","))) .log(); } }