Skip to content

Commit d8d8a05

Browse files
fab-10fab-10
authored
Update Besu to 25.6.0-linea1 (#2059)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
1 parent e2592ac commit d8d8a05

File tree

11 files changed

+79
-55
lines changed

11 files changed

+79
-55
lines changed

‎arithmetization/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ apply from: rootProject.file("gradle/lint.gradle")
3434

3535
dependencies {
3636
implementation "${besuArtifactGroup}:besu-datatypes"
37-
implementation "${besuArtifactGroup}:evm"
38-
implementation "${besuArtifactGroup}:plugin-api"
39-
implementation "${besuArtifactGroup}.internal:algorithms"
40-
implementation "${besuArtifactGroup}.internal:api"
41-
implementation "${besuArtifactGroup}.internal:clique"
42-
implementation "${besuArtifactGroup}.internal:core"
43-
implementation "${besuArtifactGroup}.internal:rlp"
37+
implementation "${besuArtifactGroup}:besu-evm"
38+
implementation "${besuArtifactGroup}:besu-plugin-api"
39+
implementation "${besuArtifactGroup}.internal:besu-consensus-clique"
40+
implementation "${besuArtifactGroup}.internal:besu-crypto-algorithms"
41+
implementation "${besuArtifactGroup}.internal:besu-ethereum-api"
42+
implementation "${besuArtifactGroup}.internal:besu-ethereum-core"
43+
implementation "${besuArtifactGroup}.internal:besu-ethereum-rlp"
4444

4545
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
4646
implementation 'info.picocli:picocli'

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
releaseVersion=beta-v3.1-rc3
2-
besuVersion=25.5.0-linea3
2+
besuVersion=25.6.0-linea1
33
shomeiVersion=2.4-develop
44
besuShomeiPluginVersion=v0.6.0-PRERELEASE
55
besuArtifactGroup=org.hyperledger.besu

‎gradle/dependency-management.gradle‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,39 @@ dependencyManagement {
5757
dependency 'com.google.code.gson:gson:2.11.0'
5858
}
5959
}
60+
61+
62+
configurations.all {
63+
// transitive versions conflict new Besu coordinates
64+
exclude group: "${besuArtifactGroup}.internal", module: 'dsl'
65+
exclude group: "${besuArtifactGroup}.internal", module: 'besu'
66+
exclude group: "${besuArtifactGroup}.internal", module: 'config'
67+
exclude group: "${besuArtifactGroup}.internal", module: 'clique'
68+
exclude group: "${besuArtifactGroup}.internal", module: 'common'
69+
exclude group: "${besuArtifactGroup}.internal", module: 'ibft'
70+
exclude group: "${besuArtifactGroup}.internal", module: 'ibftlegacy'
71+
exclude group: "${besuArtifactGroup}.internal", module: 'merge'
72+
exclude group: "${besuArtifactGroup}.internal", module: 'qbft'
73+
exclude group: "${besuArtifactGroup}.internal", module: 'qbft-core'
74+
exclude group: "${besuArtifactGroup}.internal", module: 'algorithms'
75+
exclude group: "${besuArtifactGroup}.internal", module: 'services'
76+
exclude group: "${besuArtifactGroup}.internal", module: 'api'
77+
exclude group: "${besuArtifactGroup}.internal", module: 'blockcreation'
78+
exclude group: "${besuArtifactGroup}.internal", module: 'core'
79+
exclude group: "${besuArtifactGroup}.internal", module: 'eth'
80+
exclude group: "${besuArtifactGroup}.internal", module: 'p2p'
81+
exclude group: "${besuArtifactGroup}.internal", module: 'permissioning'
82+
exclude group: "${besuArtifactGroup}.internal", module: 'referencetests'
83+
exclude group: "${besuArtifactGroup}.internal", module: 'rlp'
84+
exclude group: "${besuArtifactGroup}.internal", module: 'trie'
85+
exclude group: "${besuArtifactGroup}", module: 'evm'
86+
exclude group: "${besuArtifactGroup}.internal", module: 'metrics-core'
87+
exclude group: "${besuArtifactGroup}", module: 'plugin-api'
88+
exclude group: "${besuArtifactGroup}.internal", module: 'testutil'
89+
exclude group: "${besuArtifactGroup}.internal", module: 'util'
90+
exclude group: "${besuArtifactGroup}.internal", module: 'nat'
91+
exclude group: "${besuArtifactGroup}.internal", module: 'tasks'
92+
exclude group: "${besuArtifactGroup}.internal", module: 'pipeline'
93+
exclude group: "${besuArtifactGroup}.internal", module: 'kvstore'
94+
exclude group: "${besuArtifactGroup}.internal", module: 'enclave'
95+
}

‎plugins/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ dependencies {
4343
compileOnly 'com.google.auto.service:auto-service'
4444

4545
implementation "${besuArtifactGroup}:besu-datatypes"
46-
implementation "${besuArtifactGroup}:evm"
47-
implementation "${besuArtifactGroup}:plugin-api"
48-
implementation "${besuArtifactGroup}.internal:algorithms"
49-
implementation "${besuArtifactGroup}.internal:api"
50-
implementation "${besuArtifactGroup}.internal:clique"
51-
implementation "${besuArtifactGroup}.internal:core"
52-
implementation "${besuArtifactGroup}.internal:rlp"
46+
implementation "${besuArtifactGroup}:besu-evm"
47+
implementation "${besuArtifactGroup}:besu-plugin-api"
48+
implementation "${besuArtifactGroup}.internal:besu-consensus-clique"
49+
implementation "${besuArtifactGroup}.internal:besu-crypto-algorithms"
50+
implementation "${besuArtifactGroup}.internal:besu-ethereum-api"
51+
implementation "${besuArtifactGroup}.internal:besu-ethereum-core"
52+
implementation "${besuArtifactGroup}.internal:besu-ethereum-rlp"
5353

5454
implementation 'info.picocli:picocli'
5555

‎reference-tests/build.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,18 @@ tasks.register("jacocoReferenceGeneralStateTestsReport", JacocoReport) {
119119

120120
dependencies {
121121
testImplementation "${besuArtifactGroup}:besu-datatypes"
122-
testImplementation "${besuArtifactGroup}:evm"
123-
testImplementation "${besuArtifactGroup}.internal:config"
124-
testImplementation "${besuArtifactGroup}.internal:core"
125-
testImplementation group: "${besuArtifactGroup}.internal", name: "core", classifier: "test-support"
126-
testImplementation "${besuArtifactGroup}.internal:algorithms"
127-
testImplementation "${besuArtifactGroup}.internal:metrics-core"
128-
testImplementation "${besuArtifactGroup}.internal:referencetests"
129-
testImplementation "${besuArtifactGroup}.internal:rlp"
130-
testImplementation "${besuArtifactGroup}.internal:testutil"
131-
testImplementation "${besuArtifactGroup}.internal:trie"
132-
testImplementation "${besuArtifactGroup}.internal:util"
133-
testImplementation "${besuArtifactGroup}:plugin-api"
122+
testImplementation "${besuArtifactGroup}:besu-evm"
123+
testImplementation "${besuArtifactGroup}:besu-plugin-api"
124+
testImplementation "${besuArtifactGroup}.internal:besu-config"
125+
testImplementation "${besuArtifactGroup}.internal:besu-crypto-algorithms"
126+
testImplementation "${besuArtifactGroup}.internal:besu-ethereum-core"
127+
testImplementation group: "${besuArtifactGroup}.internal", name: "besu-ethereum-core", classifier: "test-support"
128+
testImplementation "${besuArtifactGroup}.internal:besu-ethereum-referencetests"
129+
testImplementation "${besuArtifactGroup}.internal:besu-ethereum-rlp"
130+
testImplementation "${besuArtifactGroup}.internal:besu-ethereum-trie"
131+
testImplementation "${besuArtifactGroup}.internal:besu-metrics-core"
132+
testImplementation "${besuArtifactGroup}.internal:besu-testutil"
133+
testImplementation "${besuArtifactGroup}.internal:besu-util"
134134

135135
testImplementation 'io.consensys.tuweni:tuweni-bytes'
136136
testImplementation 'io.consensys.tuweni:tuweni-units'

‎reference-tests/src/test/java/net/consensys/linea/CorsetBlockProcessor.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.hyperledger.besu.ethereum.core.Transaction;
3737
import org.hyperledger.besu.ethereum.core.TransactionReceipt;
3838
import org.hyperledger.besu.ethereum.mainnet.*;
39-
import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
4039
import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
4140
import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.worldview.BonsaiWorldState;
4241
import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
@@ -74,7 +73,6 @@ public BlockProcessingResult processBlock(
7473
final Blockchain blockchain,
7574
final MutableWorldState worldState,
7675
final Block block,
77-
final Optional<PrivateMetadataUpdater> privateMetadataUpdater,
7876
final PreprocessingFunction preprocessingBlockFunction) {
7977

8078
var blockHeader = block.getHeader();
@@ -127,9 +125,7 @@ public BlockProcessingResult processBlock(
127125
miningBeneficiary,
128126
zkTracer,
129127
blockHashLookup,
130-
true,
131128
TransactionValidationParams.processingBlock(),
132-
privateMetadataUpdater,
133129
blobGasPrice);
134130

135131
if (result.isInvalid()) {

‎reference-tests/src/test/java/net/consensys/linea/GeneralStateReferenceTestTools.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ public static void executeTest(final GeneralStateTestCaseEipSpec spec) {
293293
blockHeader.getCoinbase(),
294294
zkTracer,
295295
new BlockchainBasedBlockHashLookup(blockHeader, blockchain),
296-
false,
297296
TransactionValidationParams.processingBlock(),
298297
blobGasPrice);
299298
if (result.isInvalid()) {

‎testing/build.gradle‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ dependencies {
1616
implementation project(path: ':arithmetization')
1717

1818
implementation "${besuArtifactGroup}:besu-datatypes"
19-
implementation "${besuArtifactGroup}:evm"
20-
implementation "${besuArtifactGroup}:plugin-api"
21-
implementation "${besuArtifactGroup}.internal:api"
22-
implementation "${besuArtifactGroup}.internal:clique"
23-
implementation "${besuArtifactGroup}.internal:common"
24-
implementation "${besuArtifactGroup}.internal:config"
25-
implementation "${besuArtifactGroup}.internal:core"
26-
implementation "${besuArtifactGroup}.internal:metrics-core"
27-
implementation "${besuArtifactGroup}.internal:referencetests"
28-
implementation "${besuArtifactGroup}.internal:rlp"
29-
implementation "${besuArtifactGroup}.internal:services"
30-
implementation "${besuArtifactGroup}.internal:testutil"
31-
implementation "${besuArtifactGroup}.internal:algorithms"
32-
implementation "${besuArtifactGroup}.internal:dsl"
19+
implementation "${besuArtifactGroup}:besu-evm"
20+
implementation "${besuArtifactGroup}:besu-plugin-api"
21+
implementation "${besuArtifactGroup}.internal:besu-acceptance-tests-dsl"
22+
implementation "${besuArtifactGroup}.internal:besu-config"
23+
implementation "${besuArtifactGroup}.internal:besu-consensus-clique"
24+
implementation "${besuArtifactGroup}.internal:besu-consensus-common"
25+
implementation "${besuArtifactGroup}.internal:besu-crypto-algorithms"
26+
implementation "${besuArtifactGroup}.internal:besu-crypto-services"
27+
implementation "${besuArtifactGroup}.internal:besu-ethereum-api"
28+
implementation "${besuArtifactGroup}.internal:besu-ethereum-core"
29+
implementation "${besuArtifactGroup}.internal:besu-ethereum-referencetests"
30+
implementation "${besuArtifactGroup}.internal:besu-ethereum-rlp"
31+
implementation "${besuArtifactGroup}.internal:besu-metrics-core"
32+
implementation "${besuArtifactGroup}.internal:besu-testutil"
3333
implementation "${besuArtifactGroup}:gnark"
34-
implementation group: "${besuArtifactGroup}.internal", name: "core", classifier: "test-support", version: "${besuVersion}"
34+
implementation group: "${besuArtifactGroup}.internal", name: "besu-ethereum-core", classifier: "test-support", version: "${besuVersion}"
3535
implementation "io.consensys.protocols.shomei:shomei:${shomeiVersion}"
3636
implementation "io.consensys.protocols.shomei:shomei-server:${shomeiVersion}"
3737
implementation 'io.micrometer:micrometer-registry-prometheus:1.11.1'

‎testing/src/main/java/net/consensys/linea/testing/ExecutionEnvironment.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
4848
import org.hyperledger.besu.ethereum.core.Difficulty;
4949
import org.hyperledger.besu.ethereum.core.MiningConfiguration;
50-
import org.hyperledger.besu.ethereum.core.PrivacyParameters;
5150
import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSpecFactory;
5251
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
5352
import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
@@ -146,7 +145,6 @@ public static ProtocolSpec getProtocolSpec(BigInteger chainId, Fork fork) {
146145
genesisConfigOptions,
147146
CliqueForksSchedulesFactory.create(genesisConfigOptions),
148147
createNodeKey(),
149-
PrivacyParameters.DEFAULT,
150148
false,
151149
EvmConfiguration.DEFAULT,
152150
MiningConfiguration.MINING_DISABLED,
@@ -173,10 +171,7 @@ public static ProtocolSpec getProtocolSpec(BigInteger chainId, Fork fork) {
173171
default -> throw new IllegalArgumentException("Unexpected fork value: " + fork);
174172
};
175173

176-
return builder
177-
.privacyParameters(PrivacyParameters.DEFAULT)
178-
.badBlocksManager(badBlockManager)
179-
.build(schedule);
174+
return builder.badBlocksManager(badBlockManager).build(schedule);
180175
}
181176

182177
private static NodeKey createNodeKey() {

‎testing/src/main/java/net/consensys/linea/testing/ReplayExecutionEnvironment.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ private static void executeFrom(
279279
miningBeneficiary,
280280
buildOperationTracer(tx, txs.getOutcome(), tracer, txResultChecking),
281281
blockHashLookup,
282-
false,
283282
Wei.ZERO);
284283
resultValidator.accept(tx, outcome);
285284
// Commit transaction

0 commit comments

Comments
 (0)