From 5e604d936e0afed99d522aeeb8f95ccda4f07598 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Thu, 12 Sep 2024 10:50:30 +0200 Subject: [PATCH] Set besuVersion=24.9-delivery32 and arithmetizationVersion=0.6.0-rc1 (#71) * Set besuVersion=24.8-develop-915fcb01 and arithmetizationVersion=0.5.3-beta Signed-off-by: Fabio Di Fabio * Make it easier to reproduce and debug the failing ATs Signed-off-by: Fabio Di Fabio * fix ATs Signed-off-by: Fabio Di Fabio * Set besuVersion=24.9-delivery32 and arithmetizationVersion=0.6.0-rc1 Signed-off-by: Fabio Di Fabio * Align dependencies with Besu Signed-off-by: Fabio Di Fabio --------- Signed-off-by: Fabio Di Fabio --- .../src/test/resources/logback.xml | 14 ++++++++ .../resources/txOverflowModuleLimits.toml | 2 +- gradle.properties | 6 ++-- gradle/dependency-management.gradle | 32 +++++++++---------- gradle/dist.gradle | 2 +- .../TraceLineLimitTransactionSelector.java | 2 +- ...ckCallDataSizeTransactionSelectorTest.java | 4 ++- .../MaxBlockGasTransactionSelectorTest.java | 4 ++- .../ProfitableTransactionSelectorTest.java | 4 ++- .../TestTransactionEvaluationContext.java | 15 +++++++-- ...TraceLineLimitTransactionSelectorTest.java | 4 ++- 11 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 acceptance-tests/src/test/resources/logback.xml diff --git a/acceptance-tests/src/test/resources/logback.xml b/acceptance-tests/src/test/resources/logback.xml new file mode 100644 index 00000000..784d4409 --- /dev/null +++ b/acceptance-tests/src/test/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n + + + + + + + \ No newline at end of file diff --git a/acceptance-tests/src/test/resources/txOverflowModuleLimits.toml b/acceptance-tests/src/test/resources/txOverflowModuleLimits.toml index eb7b4c23..58f903b0 100644 --- a/acceptance-tests/src/test/resources/txOverflowModuleLimits.toml +++ b/acceptance-tests/src/test/resources/txOverflowModuleLimits.toml @@ -20,7 +20,7 @@ EUC = 16384 # can probably be lower EXP = 32760 EXT = 20 GAS = 262144 -HUB = 43 +HUB = 50 MMIO = 1048576 MMU = 524288 MOD = 20 diff --git a/gradle.properties b/gradle.properties index 965c6d52..818a56d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ -releaseVersion=0.4.0-SNAPSHOT -besuVersion=24.8-develop-74a56f5 -arithmetizationVersion=0.4.0-rc1 +releaseVersion=0.6.0-SNAPSHOT +besuVersion=24.9-delivery32 +arithmetizationVersion=0.6.0-rc1 besuArtifactGroup=io.consensys.linea-besu distributionIdentifier=linea-sequencer distributionBaseUrl=https://artifacts.consensys.net/public/linea-besu/raw/names/linea-besu.tar.gz/versions/ diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index b8104a56..6e075f32 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -85,21 +85,21 @@ dependencyManagement { entry 'logback-classic' } - dependency 'com.fasterxml.jackson.core:jackson-databind:2.16.1' - dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.1' - dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.16.1' + dependency 'com.fasterxml.jackson.core:jackson-databind:2.17.2' + dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2' + dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2' dependency 'com.google.auto.service:auto-service:1.1.1' - dependency 'com.google.guava:guava:33.0.0-jre' + dependency 'com.google.guava:guava:33.3.0-jre' - dependency 'commons-io:commons-io:2.15.1' + dependency 'commons-io:commons-io:2.16.1' dependency 'com.slack.api:slack-api-client:1.32.1' dependency 'com.splunk.logging:splunk-library-javalogging:1.11.8' - dependencySet(group: 'info.picocli', version: '4.7.5') { + dependencySet(group: 'info.picocli', version: '4.7.6') { entry 'picocli' entry 'picocli-codegen' } @@ -111,15 +111,15 @@ dependencyManagement { entry 'tuweni-units' } - dependency 'io.vertx:vertx-core:4.5.8' + dependency 'io.vertx:vertx-core:4.5.9' dependency 'junit:junit:4.13.2' dependency 'net.java.dev.jna:jna:5.14.0' - dependency 'org.assertj:assertj-core:3.25.1' + dependency 'org.assertj:assertj-core:3.26.3' - dependency 'org.apache.commons:commons-lang3:3.14.0' + dependency 'org.apache.commons:commons-lang3:3.17.0' dependencySet(group: 'org.apache.logging.log4j', version: '2.23.1') { entry 'log4j-api' @@ -127,9 +127,9 @@ dependencyManagement { entry 'log4j-slf4j2-impl' } - dependency 'org.awaitility:awaitility:4.2.0' + dependency 'org.awaitility:awaitility:4.2.2' - dependencySet(group: 'org.bouncycastle', version: '1.77') { + dependencySet(group: 'org.bouncycastle', version: '1.78.1') { entry 'bcpkix-jdk18on' entry 'bcprov-jdk18on' entry 'jcajce' @@ -137,21 +137,21 @@ dependencyManagement { dependency 'org.hibernate.validator:hibernate-validator:8.0.1.Final' - dependencySet(group: 'org.junit.jupiter', version: '5.10.2') { + dependencySet(group: 'org.junit.jupiter', version: '5.11.0') { entry 'junit-jupiter-api' entry 'junit-jupiter-engine' entry 'junit-jupiter-params' } - dependency 'org.junit.vintage:junit-vintage-engine:5.10.2' + dependency 'org.junit.vintage:junit-vintage-engine:5.11.0' - dependencySet(group: 'org.mockito', version: '5.8.0') { + dependencySet(group: 'org.mockito', version: '5.13.0') { entry 'mockito-core' entry 'mockito-junit-jupiter' } - dependency 'org.slf4j:slf4j-api:2.0.10' + dependency 'org.slf4j:slf4j-api:2.0.16' - dependencySet(group: 'org.web3j', version: '4.12.0') { + dependencySet(group: 'org.web3j', version: '4.12.1') { entry 'abi' entry 'besu' entry 'core' diff --git a/gradle/dist.gradle b/gradle/dist.gradle index d876b232..891fbde8 100644 --- a/gradle/dist.gradle +++ b/gradle/dist.gradle @@ -43,7 +43,7 @@ jar { configurations.runtimeClasspath.filter( {! (it.name =~ /log4j.*\.jar/ )} ) .collect {it.isDirectory() ? it : zipTree(it) } } - exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA' + exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA', 'ch.qos.logback' duplicatesStrategy(DuplicatesStrategy.EXCLUDE) } diff --git a/sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java b/sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java index b93c6df5..79c857e9 100644 --- a/sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java +++ b/sequencer/src/main/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java @@ -32,7 +32,7 @@ import net.consensys.linea.sequencer.modulelimit.ModuleLimitsValidationResult; import net.consensys.linea.sequencer.modulelimit.ModuleLineCountValidator; import net.consensys.linea.zktracer.ZkTracer; -import net.consensys.linea.zktracer.module.Module; +import net.consensys.linea.zktracer.container.module.Module; import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.datatypes.PendingTransaction; import org.hyperledger.besu.datatypes.Transaction; diff --git a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockCallDataSizeTransactionSelectorTest.java b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockCallDataSizeTransactionSelectorTest.java index 230e3f0d..95933275 100644 --- a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockCallDataSizeTransactionSelectorTest.java +++ b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockCallDataSizeTransactionSelectorTest.java @@ -23,6 +23,7 @@ import org.apache.tuweni.bytes.Bytes; import org.hyperledger.besu.datatypes.PendingTransaction; import org.hyperledger.besu.datatypes.Transaction; +import org.hyperledger.besu.plugin.data.ProcessableBlockHeader; import org.hyperledger.besu.plugin.data.TransactionProcessingResult; import org.hyperledger.besu.plugin.data.TransactionSelectionResult; import org.hyperledger.besu.plugin.services.txselection.PluginTransactionSelector; @@ -101,6 +102,7 @@ private TestTransactionEvaluationContext mockTransactionOfCallDataSize(final int Transaction transaction = mock(Transaction.class); when(pendingTransaction.getTransaction()).thenReturn(transaction); when(transaction.getPayload()).thenReturn(Bytes.repeat((byte) 1, size)); - return new TestTransactionEvaluationContext(pendingTransaction); + return new TestTransactionEvaluationContext( + mock(ProcessableBlockHeader.class), pendingTransaction); } } diff --git a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockGasTransactionSelectorTest.java b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockGasTransactionSelectorTest.java index 65d32111..289e7878 100644 --- a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockGasTransactionSelectorTest.java +++ b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/MaxBlockGasTransactionSelectorTest.java @@ -23,6 +23,7 @@ import org.hyperledger.besu.datatypes.PendingTransaction; import org.hyperledger.besu.datatypes.Transaction; +import org.hyperledger.besu.plugin.data.ProcessableBlockHeader; import org.hyperledger.besu.plugin.data.TransactionProcessingResult; import org.hyperledger.besu.plugin.data.TransactionSelectionResult; import org.hyperledger.besu.plugin.services.txselection.PluginTransactionSelector; @@ -104,7 +105,8 @@ private TestTransactionEvaluationContext mockEvaluationContext() { PendingTransaction pendingTransaction = mock(PendingTransaction.class); Transaction transaction = mock(Transaction.class); when(pendingTransaction.getTransaction()).thenReturn(transaction); - return new TestTransactionEvaluationContext(pendingTransaction); + return new TestTransactionEvaluationContext( + mock(ProcessableBlockHeader.class), pendingTransaction); } private TransactionProcessingResult mockTransactionProcessingResult(long gasUsedByTransaction) { diff --git a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/ProfitableTransactionSelectorTest.java b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/ProfitableTransactionSelectorTest.java index 0dfb6fc9..164e7e30 100644 --- a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/ProfitableTransactionSelectorTest.java +++ b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/ProfitableTransactionSelectorTest.java @@ -35,6 +35,7 @@ import org.hyperledger.besu.datatypes.PendingTransaction; import org.hyperledger.besu.datatypes.Transaction; import org.hyperledger.besu.datatypes.Wei; +import org.hyperledger.besu.plugin.data.ProcessableBlockHeader; import org.hyperledger.besu.plugin.data.TransactionProcessingResult; import org.hyperledger.besu.plugin.data.TransactionSelectionResult; import org.hyperledger.besu.plugin.services.BlockchainService; @@ -361,7 +362,8 @@ private TestTransactionEvaluationContext mockEvaluationContext( when(transaction.encoded()).thenReturn(Bytes.wrap(pseudoRandomBytes(size))); when(pendingTransaction.getTransaction()).thenReturn(transaction); when(pendingTransaction.hasPriority()).thenReturn(hasPriority); - return new TestTransactionEvaluationContext(pendingTransaction, effectiveGasPrice, minGasPrice); + return new TestTransactionEvaluationContext( + mock(ProcessableBlockHeader.class), pendingTransaction, effectiveGasPrice, minGasPrice); } private byte[] pseudoRandomBytes(int size) { diff --git a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/TestTransactionEvaluationContext.java b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/TestTransactionEvaluationContext.java index 5ee9700f..7a7e39ab 100644 --- a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/TestTransactionEvaluationContext.java +++ b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/TestTransactionEvaluationContext.java @@ -17,24 +17,35 @@ import com.google.common.base.Stopwatch; import org.hyperledger.besu.datatypes.PendingTransaction; import org.hyperledger.besu.datatypes.Wei; +import org.hyperledger.besu.plugin.data.ProcessableBlockHeader; import org.hyperledger.besu.plugin.services.txselection.TransactionEvaluationContext; class TestTransactionEvaluationContext implements TransactionEvaluationContext { + private ProcessableBlockHeader processableBlockHeader; private PendingTransaction pendingTransaction; private Wei transactionGasPrice; private Wei minGasPrice; public TestTransactionEvaluationContext( + final ProcessableBlockHeader processableBlockHeader, final PendingTransaction pendingTransaction, final Wei transactionGasPrice, final Wei minGasPrice) { + this.processableBlockHeader = processableBlockHeader; this.pendingTransaction = pendingTransaction; this.transactionGasPrice = transactionGasPrice; this.minGasPrice = minGasPrice; } - public TestTransactionEvaluationContext(final PendingTransaction pendingTransaction) { - this(pendingTransaction, Wei.ONE, Wei.ONE); + public TestTransactionEvaluationContext( + final ProcessableBlockHeader processableBlockHeader, + final PendingTransaction pendingTransaction) { + this(processableBlockHeader, pendingTransaction, Wei.ONE, Wei.ONE); + } + + @Override + public ProcessableBlockHeader getPendingBlockHeader() { + return processableBlockHeader; } @Override diff --git a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelectorTest.java b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelectorTest.java index ae439f1c..103eea16 100644 --- a/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelectorTest.java +++ b/sequencer/src/test/java/net/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelectorTest.java @@ -38,6 +38,7 @@ import org.hyperledger.besu.datatypes.PendingTransaction; import org.hyperledger.besu.datatypes.Transaction; import org.hyperledger.besu.datatypes.Wei; +import org.hyperledger.besu.plugin.data.ProcessableBlockHeader; import org.hyperledger.besu.plugin.data.TransactionProcessingResult; import org.hyperledger.besu.plugin.data.TransactionSelectionResult; import org.hyperledger.besu.plugin.services.txselection.PluginTransactionSelector; @@ -238,7 +239,8 @@ private TestTransactionEvaluationContext mockEvaluationContext( when(transaction.getGasLimit()).thenReturn(gasLimit); when(pendingTransaction.getTransaction()).thenReturn(transaction); when(pendingTransaction.hasPriority()).thenReturn(hasPriority); - return new TestTransactionEvaluationContext(pendingTransaction, effectiveGasPrice, minGasPrice); + return new TestTransactionEvaluationContext( + mock(ProcessableBlockHeader.class), pendingTransaction, effectiveGasPrice, minGasPrice); } private class TestableTraceLineLimitTransactionSelector