Merge branch 'main' into support-stateful-block-tx-selectors · Consensys/linea-sequencer@199ae37 · GitHub

Commit

Merge branch 'main' into support-stateful-block-tx-selectors

Browse files

# Conflicts:
#	gradle.properties
#	sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockCallDataTransactionSelector.java
#	sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockGasTransactionSelector.java
#	sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java

Loading branch information

fab-10 committed Feb 11, 2025

2 parents 17d1d96 + 055f64e commit 199ae37