From 398be120b457dca177ab6786260af2b97f06c68e Mon Sep 17 00:00:00 2001 From: Mehdi AOUADI Date: Wed, 16 Oct 2024 10:26:00 +0200 Subject: [PATCH 1/3] update EL get blobs logs wording (#8729) * update EL get blobs logs --- .../util/BlockBlobSidecarsTrackersPoolImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java index 1fce18dd2aa..8b90393da57 100644 --- a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java +++ b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java @@ -499,7 +499,7 @@ private BlockBlobSidecarsTracker internalOnNewBlock( .finish( error -> LOG.error( - "An occurred while attempting to fetch blobs via local EL")); + "An error occurred while attempting to fetch blobs via local EL")); } } }); @@ -576,7 +576,7 @@ private void onFirstSeen(final SlotAndBlockRoot slotAndBlockRoot) { error -> LOG.warn( "Local EL blobs lookup failed: {}", - ExceptionUtils.getMessage(error))) + ExceptionUtils.getRootCauseMessage(error))) .thenRun(() -> this.fetchMissingContentFromRemotePeers(slotAndBlockRoot)), fetchDelay) .finish( From f5790a5377618f50226d1c78020b6962674f7d6c Mon Sep 17 00:00:00 2001 From: Anton Nashatyrev Date: Wed, 16 Oct 2024 12:22:47 +0300 Subject: [PATCH 2/3] Fix missing Gossip subnet subscription on startup (#8730) --- .../teku/networking/eth2/ActiveEth2P2PNetwork.java | 3 ++- .../eth2/gossip/forks/GossipForkManager.java | 5 ++++- .../eth2/gossip/forks/GossipForkManagerTest.java | 13 +++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/ActiveEth2P2PNetwork.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/ActiveEth2P2PNetwork.java index 4851bf01133..6dd13b98f27 100644 --- a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/ActiveEth2P2PNetwork.java +++ b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/ActiveEth2P2PNetwork.java @@ -168,6 +168,8 @@ private synchronized void stopGossip() { @Override public void onSyncStateChanged(final boolean isInSync, final boolean isOptimistic) { + gossipForkManager.onOptimisticHeadChanged(isOptimistic); + if (state.get() != State.RUNNING) { return; } @@ -176,7 +178,6 @@ public void onSyncStateChanged(final boolean isInSync, final boolean isOptimisti } else { stopGossip(); } - gossipForkManager.onOptimisticHeadChanged(isOptimistic); } @VisibleForTesting diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/GossipForkManager.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/GossipForkManager.java index 52462fa0390..3220469395c 100644 --- a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/GossipForkManager.java +++ b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/GossipForkManager.java @@ -63,6 +63,7 @@ public class GossipForkManager { private final IntSet currentSyncCommitteeSubnets = new IntOpenHashSet(); private Optional currentEpoch = Optional.empty(); + private boolean isHeadOptimistic; private GossipForkManager( final Spec spec, @@ -71,6 +72,7 @@ private GossipForkManager( this.spec = spec; this.recentChainData = recentChainData; this.forksByActivationEpoch = forksByActivationEpoch; + this.isHeadOptimistic = recentChainData.isChainHeadOptimistic(); } public static GossipForkManager.Builder builder() { @@ -141,6 +143,7 @@ public synchronized void stopGossip() { } public synchronized void onOptimisticHeadChanged(final boolean isHeadOptimistic) { + this.isHeadOptimistic = isHeadOptimistic; if (isHeadOptimistic) { activeSubscriptions.forEach(GossipForkSubscriptions::stopGossipForOptimisticSync); } else { @@ -279,7 +282,7 @@ private void startSubscriptions(final GossipForkSubscriptions subscription) { if (activeSubscriptions.add(subscription)) { subscription.startGossip( recentChainData.getGenesisData().orElseThrow().getGenesisValidatorsRoot(), - recentChainData.isChainHeadOptimistic()); + isHeadOptimistic); currentAttestationSubnets.forEach(subscription::subscribeToAttestationSubnetId); currentSyncCommitteeSubnets.forEach(subscription::subscribeToSyncCommitteeSubnet); } diff --git a/networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/gossip/forks/GossipForkManagerTest.java b/networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/gossip/forks/GossipForkManagerTest.java index f4460d3fe01..06a7cd3c39b 100644 --- a/networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/gossip/forks/GossipForkManagerTest.java +++ b/networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/gossip/forks/GossipForkManagerTest.java @@ -568,6 +568,19 @@ void shouldStartSubscriptionsInOptimisticSyncMode() { verify(subscriptions).startGossip(GENESIS_VALIDATORS_ROOT, true); } + @Test + void shouldStartSubscriptionsInNonOptimisticSyncModeWhenSyncStateChangedBeforeStart() { + when(recentChainData.isChainHeadOptimistic()).thenReturn(true); + + final GossipForkSubscriptions subscriptions = forkAtEpoch(0); + final GossipForkManager manager = managerForForks(subscriptions); + + manager.onOptimisticHeadChanged(false); + manager.configureGossipForEpoch(UInt64.ZERO); + + verify(subscriptions).startGossip(GENESIS_VALIDATORS_ROOT, false); + } + private GossipForkSubscriptions forkAtEpoch(final long epoch) { final GossipForkSubscriptions subscriptions = mock(GossipForkSubscriptions.class, "subscriptionsForEpoch" + epoch); From afacaae2168e800af8da349fc510d4e5583224f8 Mon Sep 17 00:00:00 2001 From: David Ryan Date: Thu, 17 Oct 2024 02:13:34 +1100 Subject: [PATCH 3/3] update to latest release of tuweni. Switch from org.apache to io.tmio (#8712) Co-authored-by: Enrico Del Fante --- acceptance-tests/build.gradle | 2 +- beacon/pow/build.gradle | 2 +- beacon/sync/build.gradle | 2 +- beacon/validator/build.gradle | 4 ++-- build.gradle | 2 +- data/beaconrestapi/build.gradle | 2 +- data/provider/build.gradle | 2 +- data/serializer/build.gradle | 2 +- eth-benchmark-tests/build.gradle | 8 ++++---- eth-reference-tests/build.gradle | 6 +++--- eth-tests/build.gradle | 4 ++-- ethereum/dataproviders/build.gradle | 2 +- ethereum/executionclient/build.gradle | 2 +- ethereum/json-types/build.gradle | 2 +- ethereum/networks/build.gradle | 2 +- ethereum/signingrecord/build.gradle | 2 +- ethereum/spec/build.gradle | 14 +++++++------- ethereum/statetransition/build.gradle | 2 +- fork-choice-tests/build.gradle | 4 ++-- fuzz/build.gradle | 2 +- gradle/versions.gradle | 2 +- infrastructure/bls-keystore/build.gradle | 4 ++-- infrastructure/bls/build.gradle | 6 +++--- infrastructure/bytes/build.gradle | 2 +- infrastructure/crypto/build.gradle | 2 +- infrastructure/io/build.gradle | 2 +- infrastructure/jackson/build.gradle | 2 +- infrastructure/json/build.gradle | 2 +- infrastructure/kzg/build.gradle | 4 ++-- infrastructure/logging/build.gradle | 4 ++-- infrastructure/metrics/build.gradle | 2 +- infrastructure/ssz/build.gradle | 6 +++--- infrastructure/ssz/generator/build.gradle | 2 +- infrastructure/yaml/build.gradle | 2 +- networking/eth2/build.gradle | 2 +- networking/p2p/build.gradle | 6 +++--- services/executionlayer/build.gradle | 2 +- services/powchain/build.gradle | 2 +- storage/api/build.gradle | 2 +- storage/build.gradle | 4 ++-- teku/build.gradle | 4 ++-- validator/beaconnode/build.gradle | 2 +- validator/client/build.gradle | 2 +- validator/eventadapter/build.gradle | 2 +- 44 files changed, 69 insertions(+), 69 deletions(-) diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle index 5136e15a20e..f732ec2b4fa 100644 --- a/acceptance-tests/build.gradle +++ b/acceptance-tests/build.gradle @@ -28,7 +28,7 @@ dependencies { testFixturesImplementation 'io.libp2p:jvm-libp2p' testFixturesImplementation 'org.apache.commons:commons-lang3' testFixturesImplementation 'commons-io:commons-io' - testFixturesImplementation 'org.apache.tuweni:tuweni-bytes' + testFixturesImplementation 'io.tmio:tuweni-bytes' testFixturesImplementation 'org.junit.jupiter:junit-jupiter-api' testFixturesImplementation 'org.testcontainers:testcontainers' testFixturesImplementation 'org.testcontainers:junit-jupiter' diff --git a/beacon/pow/build.gradle b/beacon/pow/build.gradle index 80e89168f32..d5e8f10e189 100644 --- a/beacon/pow/build.gradle +++ b/beacon/pow/build.gradle @@ -18,7 +18,7 @@ dependencies { api 'org.web3j:core' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation testFixtures(project(':infrastructure:async')) testImplementation testFixtures(project(':infrastructure:time')) diff --git a/beacon/sync/build.gradle b/beacon/sync/build.gradle index 35a17772b5b..63feb29193d 100644 --- a/beacon/sync/build.gradle +++ b/beacon/sync/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation project(':storage:api') implementation project(':infrastructure:events') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' testImplementation testFixtures(project(':ethereum:spec')) testImplementation testFixtures(project(':ethereum:statetransition')) diff --git a/beacon/validator/build.gradle b/beacon/validator/build.gradle index d069f585e01..e100f1d6407 100644 --- a/beacon/validator/build.gradle +++ b/beacon/validator/build.gradle @@ -33,8 +33,8 @@ dependencies { implementation project(':ethereum:json-types') implementation 'it.unimi.dsi:fastutil' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-ssz' + implementation 'io.tmio:tuweni-bytes' + implementation 'io.tmio:tuweni-ssz' testImplementation project(':infrastructure:metrics') testImplementation testFixtures(project(':ethereum:spec')) diff --git a/build.gradle b/build.gradle index d59bfffd00f..177c76480ad 100644 --- a/build.gradle +++ b/build.gradle @@ -887,7 +887,7 @@ subprojects { runtimeOnly 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl' - testImplementation 'org.apache.tuweni:tuweni-junit' + testImplementation 'io.tmio:tuweni-junit' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' testImplementation 'org.junit.jupiter:junit-jupiter-api' diff --git a/data/beaconrestapi/build.gradle b/data/beaconrestapi/build.gradle index b743075279c..64d2f16aa84 100644 --- a/data/beaconrestapi/build.gradle +++ b/data/beaconrestapi/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation 'io.swagger.core.v3:swagger-annotations' implementation 'io.github.classgraph:classgraph' implementation 'io.javalin:javalin' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' implementation 'org.webjars:swagger-ui' testImplementation testFixtures(project(':storage')) diff --git a/data/provider/build.gradle b/data/provider/build.gradle index 4cc4a6eaf06..7ebbfbdfa02 100644 --- a/data/provider/build.gradle +++ b/data/provider/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation project(':ethereum:json-types') - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation testFixtures(project(':ethereum:spec')) testImplementation testFixtures(project(':infrastructure:async')) diff --git a/data/serializer/build.gradle b/data/serializer/build.gradle index 12b1e3d679f..4302d4d8e80 100644 --- a/data/serializer/build.gradle +++ b/data/serializer/build.gradle @@ -10,7 +10,7 @@ dependencies { implementation project(':infrastructure:jackson') implementation project(':infrastructure:async') - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation project(':data:provider') testImplementation testFixtures(project(':ethereum:spec')) diff --git a/eth-benchmark-tests/build.gradle b/eth-benchmark-tests/build.gradle index cd91412cdac..5114ae3208a 100644 --- a/eth-benchmark-tests/build.gradle +++ b/eth-benchmark-tests/build.gradle @@ -17,10 +17,10 @@ dependencies { implementation testFixtures(project(':ethereum:statetransition')) jmhImplementation testFixtures(project(':eth-benchmark-tests')) - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' jmhImplementation project(':infrastructure:crypto') - jmhImplementation 'org.apache.tuweni:tuweni-ssz' + jmhImplementation 'io.tmio:tuweni-ssz' jmhImplementation testFixtures(project(':ethereum:weaksubjectivity')) jmhImplementation testFixtures(project(':infrastructure:async')) @@ -34,6 +34,6 @@ dependencies { testFixturesImplementation testFixtures(project(':ethereum:statetransition')) testFixturesImplementation testFixtures(project(':storage')) - testFixturesImplementation 'org.apache.tuweni:tuweni-bytes' - testFixturesImplementation 'org.apache.tuweni:tuweni-ssz' + testFixturesImplementation 'io.tmio:tuweni-bytes' + testFixturesImplementation 'io.tmio:tuweni-ssz' } \ No newline at end of file diff --git a/eth-reference-tests/build.gradle b/eth-reference-tests/build.gradle index fede0acf83f..91cb2a10c90 100644 --- a/eth-reference-tests/build.gradle +++ b/eth-reference-tests/build.gradle @@ -24,9 +24,9 @@ dependencies { referenceTestImplementation 'org.hyperledger.besu:plugin-api' referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind' referenceTestImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' - referenceTestImplementation 'org.apache.tuweni:tuweni-bytes' - referenceTestImplementation 'org.apache.tuweni:tuweni-junit' - referenceTestImplementation 'org.apache.tuweni:tuweni-ssz' + referenceTestImplementation 'io.tmio:tuweni-bytes' + referenceTestImplementation 'io.tmio:tuweni-junit' + referenceTestImplementation 'io.tmio:tuweni-ssz' referenceTestImplementation 'org.xerial.snappy:snappy-java' } diff --git a/eth-tests/build.gradle b/eth-tests/build.gradle index 4536695d768..8b36a75caf4 100644 --- a/eth-tests/build.gradle +++ b/eth-tests/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' implementation 'org.apache.commons:commons-text' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-bytes' + implementation 'io.tmio:tuweni-units' implementation 'org.junit.jupiter:junit-jupiter-params' } diff --git a/ethereum/dataproviders/build.gradle b/ethereum/dataproviders/build.gradle index 5628beade60..62b4dfc745d 100644 --- a/ethereum/dataproviders/build.gradle +++ b/ethereum/dataproviders/build.gradle @@ -3,7 +3,7 @@ dependencies { implementation project(':infrastructure:async') implementation project(':infrastructure:metrics') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' testImplementation testFixtures(project(':ethereum:spec')) testImplementation testFixtures(project(':ethereum:networks')) diff --git a/ethereum/executionclient/build.gradle b/ethereum/executionclient/build.gradle index b841ed91e78..24346553426 100644 --- a/ethereum/executionclient/build.gradle +++ b/ethereum/executionclient/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation project(':ethereum:events') api 'org.web3j:core' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' implementation 'io.jsonwebtoken:jjwt-api' runtimeOnly 'io.jsonwebtoken:jjwt-impl' diff --git a/ethereum/json-types/build.gradle b/ethereum/json-types/build.gradle index f9b26eeae30..3fac462fbee 100644 --- a/ethereum/json-types/build.gradle +++ b/ethereum/json-types/build.gradle @@ -5,7 +5,7 @@ dependencies { implementation project(':infrastructure:restapi') implementation project(':infrastructure:http') - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation testFixtures(project(':ethereum:spec')) } \ No newline at end of file diff --git a/ethereum/networks/build.gradle b/ethereum/networks/build.gradle index 2d3ed76ec26..442bb20fe18 100644 --- a/ethereum/networks/build.gradle +++ b/ethereum/networks/build.gradle @@ -7,7 +7,7 @@ dependencies { implementation project(':infrastructure:io') implementation project(':infrastructure:exceptions') implementation project(':infrastructure:time') - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation 'tech.pegasys.discovery:discovery' diff --git a/ethereum/signingrecord/build.gradle b/ethereum/signingrecord/build.gradle index dfbe033c8e6..b1b545b1dff 100644 --- a/ethereum/signingrecord/build.gradle +++ b/ethereum/signingrecord/build.gradle @@ -1,6 +1,6 @@ dependencies { implementation project(':infrastructure:yaml') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' } diff --git a/ethereum/spec/build.gradle b/ethereum/spec/build.gradle index be9b639afe6..33bd692413c 100644 --- a/ethereum/spec/build.gradle +++ b/ethereum/spec/build.gradle @@ -1,6 +1,6 @@ dependencies { api 'it.unimi.dsi:fastutil' - api 'org.apache.tuweni:tuweni-bytes' + api 'io.tmio:tuweni-bytes' api project(':infrastructure:bls') api project(':infrastructure:bytes') api project(':infrastructure:collections') @@ -9,9 +9,9 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-ssz' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-bytes' + implementation 'io.tmio:tuweni-ssz' + implementation 'io.tmio:tuweni-units' implementation project(':ethereum:performance-trackers') implementation project(':ethereum:execution-types') implementation project(':ethereum:pow:api') @@ -28,7 +28,7 @@ dependencies { implementation project(':infrastructure:time') testFixturesApi 'com.google.guava:guava' - testFixturesApi 'org.apache.tuweni:tuweni-bytes' + testFixturesApi 'io.tmio:tuweni-bytes' testFixturesApi project(':ethereum:pow:api') testFixturesApi project(':infrastructure:ssz') testFixturesApi project(':infrastructure:unsigned') @@ -36,8 +36,8 @@ dependencies { testFixturesImplementation 'com.fasterxml.jackson.core:jackson-databind' testFixturesImplementation 'net.jqwik:jqwik' testFixturesImplementation 'org.apache.logging.log4j:log4j-api' - testFixturesImplementation 'org.apache.tuweni:tuweni-units' - testFixturesImplementation 'org.apache.tuweni:tuweni-ssz' + testFixturesImplementation 'io.tmio:tuweni-units' + testFixturesImplementation 'io.tmio:tuweni-ssz' testFixturesImplementation 'org.hyperledger.besu.internal:core' testFixturesImplementation 'org.hyperledger.besu.internal:config' testFixturesImplementation 'org.hyperledger.besu:besu-datatypes' diff --git a/ethereum/statetransition/build.gradle b/ethereum/statetransition/build.gradle index 71e77a9d590..b1007fb0aa0 100644 --- a/ethereum/statetransition/build.gradle +++ b/ethereum/statetransition/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation project(':storage') implementation project(':storage:api') - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation testFixtures(project(':ethereum:spec')) testImplementation testFixtures(project(':ethereum:networks')) diff --git a/fork-choice-tests/build.gradle b/fork-choice-tests/build.gradle index 0f948ea186c..0225812d304 100644 --- a/fork-choice-tests/build.gradle +++ b/fork-choice-tests/build.gradle @@ -18,6 +18,6 @@ dependencies { integrationTestImplementation 'com.fasterxml.jackson.core:jackson-databind' integrationTestImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' - integrationTestImplementation 'org.apache.tuweni:tuweni-bytes' - integrationTestImplementation 'org.apache.tuweni:tuweni-junit' + integrationTestImplementation 'io.tmio:tuweni-bytes' + integrationTestImplementation 'io.tmio:tuweni-junit' } diff --git a/fuzz/build.gradle b/fuzz/build.gradle index 4c3b69b3989..66e809ff2e8 100644 --- a/fuzz/build.gradle +++ b/fuzz/build.gradle @@ -5,7 +5,7 @@ dependencies { implementation project(':infrastructure:bls') implementation project(':infrastructure:ssz') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' implementation 'it.unimi.dsi:fastutil' testImplementation 'org.xerial.snappy:snappy-java' diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 6c987549df0..fc471b2a5c5 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -76,7 +76,7 @@ dependencyManagement { dependency 'javax.annotation:javax.annotation-api:1.3.2' - dependencySet(group: 'org.apache.tuweni', version: '2.3.1') { + dependencySet(group: 'io.tmio', version: '2.4.2') { entry 'tuweni-bytes' entry 'tuweni-crypto' entry 'tuweni-junit' diff --git a/infrastructure/bls-keystore/build.gradle b/infrastructure/bls-keystore/build.gradle index 7507f4ea06e..23b7d8d4612 100644 --- a/infrastructure/bls-keystore/build.gradle +++ b/infrastructure/bls-keystore/build.gradle @@ -18,8 +18,8 @@ dependencies { implementation 'org.bouncycastle:bcprov-jdk18on' implementation 'com.google.guava:guava' implementation 'org.apache.logging.log4j:log4j-api' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-crypto' + implementation 'io.tmio:tuweni-bytes' + implementation 'io.tmio:tuweni-crypto' testImplementation 'org.assertj:assertj-core' testImplementation 'org.junit.jupiter:junit-jupiter-engine' diff --git a/infrastructure/bls/build.gradle b/infrastructure/bls/build.gradle index a4631dbbee4..25d40259232 100644 --- a/infrastructure/bls/build.gradle +++ b/infrastructure/bls/build.gradle @@ -1,12 +1,12 @@ dependencies { api 'org.bouncycastle:bcprov-jdk18on' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-ssz' + implementation 'io.tmio:tuweni-bytes' + implementation 'io.tmio:tuweni-ssz' implementation 'commons-io:commons-io' implementation 'tech.pegasys:jblst' implementation project(':infrastructure:crypto') implementation project(':infrastructure:logging') - testFixturesImplementation 'org.apache.tuweni:tuweni-bytes' + testFixturesImplementation 'io.tmio:tuweni-bytes' } diff --git a/infrastructure/bytes/build.gradle b/infrastructure/bytes/build.gradle index 37b84d355ca..721a4ec7ea8 100644 --- a/infrastructure/bytes/build.gradle +++ b/infrastructure/bytes/build.gradle @@ -1,3 +1,3 @@ dependencies { - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' } \ No newline at end of file diff --git a/infrastructure/crypto/build.gradle b/infrastructure/crypto/build.gradle index 8e2596508c9..8a49605500f 100644 --- a/infrastructure/crypto/build.gradle +++ b/infrastructure/crypto/build.gradle @@ -1,6 +1,6 @@ dependencies { api 'org.bouncycastle:bcprov-jdk18on' - api 'org.apache.tuweni:tuweni-bytes' + api 'io.tmio:tuweni-bytes' jmhImplementation 'org.bouncycastle:bcprov-jdk18on' diff --git a/infrastructure/io/build.gradle b/infrastructure/io/build.gradle index 13c2646774c..7bfa324f856 100644 --- a/infrastructure/io/build.gradle +++ b/infrastructure/io/build.gradle @@ -1,5 +1,5 @@ dependencies { - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' implementation 'net.java.dev.jna:jna' implementation project(':infrastructure:exceptions') diff --git a/infrastructure/jackson/build.gradle b/infrastructure/jackson/build.gradle index 2cc47ef419e..3f1451d6923 100644 --- a/infrastructure/jackson/build.gradle +++ b/infrastructure/jackson/build.gradle @@ -4,5 +4,5 @@ dependencies { implementation project(':infrastructure:bytes') - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' } \ No newline at end of file diff --git a/infrastructure/json/build.gradle b/infrastructure/json/build.gradle index e4497753d55..71fdb655df2 100644 --- a/infrastructure/json/build.gradle +++ b/infrastructure/json/build.gradle @@ -5,7 +5,7 @@ dependencies { implementation project(':infrastructure:logging') implementation 'com.fasterxml.jackson.core:jackson-databind' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testFixturesImplementation 'com.fasterxml.jackson.core:jackson-databind' testFixturesImplementation 'commons-io:commons-io' diff --git a/infrastructure/kzg/build.gradle b/infrastructure/kzg/build.gradle index bdf4961f58e..26c06ca24c0 100644 --- a/infrastructure/kzg/build.gradle +++ b/infrastructure/kzg/build.gradle @@ -2,8 +2,8 @@ dependencies { implementation project(':infrastructure:io') implementation project(':infrastructure:http') - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-ssz' + implementation 'io.tmio:tuweni-bytes' + implementation 'io.tmio:tuweni-ssz' implementation 'io.consensys.protocols:jc-kzg-4844' implementation 'commons-io:commons-io' diff --git a/infrastructure/logging/build.gradle b/infrastructure/logging/build.gradle index 3c5d07970de..7687836b6ee 100644 --- a/infrastructure/logging/build.gradle +++ b/infrastructure/logging/build.gradle @@ -1,6 +1,6 @@ dependencies { - api 'org.apache.tuweni:tuweni-bytes' - api 'org.apache.tuweni:tuweni-units' + api 'io.tmio:tuweni-bytes' + api 'io.tmio:tuweni-units' implementation 'org.web3j:utils' implementation 'org.apache.logging.log4j:log4j-core' diff --git a/infrastructure/metrics/build.gradle b/infrastructure/metrics/build.gradle index 48464631b65..f300d1146e7 100644 --- a/infrastructure/metrics/build.gradle +++ b/infrastructure/metrics/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation 'io.prometheus:simpleclient' implementation 'io.vertx:vertx-core' implementation 'io.vertx:vertx-web' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' implementation 'org.hdrhistogram:HdrHistogram' implementation 'org.hyperledger.besu.internal:metrics-core' diff --git a/infrastructure/ssz/build.gradle b/infrastructure/ssz/build.gradle index 856f5dc971e..c48f6db72a6 100644 --- a/infrastructure/ssz/build.gradle +++ b/infrastructure/ssz/build.gradle @@ -8,13 +8,13 @@ dependencies { implementation 'it.unimi.dsi:fastutil' implementation 'org.apache.commons:commons-lang3' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation testFixtures(project(':infrastructure:collections')) testImplementation testFixtures(project(':infrastructure:serviceutils')) - testFixturesApi 'org.apache.tuweni:tuweni-bytes' - testFixturesApi 'org.apache.tuweni:tuweni-units' + testFixturesApi 'io.tmio:tuweni-bytes' + testFixturesApi 'io.tmio:tuweni-units' testFixturesApi project(':infrastructure:unsigned') testFixturesImplementation project(':infrastructure:bytes') testFixturesImplementation 'it.unimi.dsi:fastutil' diff --git a/infrastructure/ssz/generator/build.gradle b/infrastructure/ssz/generator/build.gradle index c566f99fbd8..5503820a404 100644 --- a/infrastructure/ssz/generator/build.gradle +++ b/infrastructure/ssz/generator/build.gradle @@ -1,5 +1,5 @@ dependencies { - compileOnly 'org.apache.tuweni:tuweni-bytes' + compileOnly 'io.tmio:tuweni-bytes' implementation project(':infrastructure:ssz') } diff --git a/infrastructure/yaml/build.gradle b/infrastructure/yaml/build.gradle index 90a59dbdeb6..e184a680e03 100644 --- a/infrastructure/yaml/build.gradle +++ b/infrastructure/yaml/build.gradle @@ -1,6 +1,6 @@ dependencies { implementation project(':infrastructure:jackson') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' } diff --git a/networking/eth2/build.gradle b/networking/eth2/build.gradle index a001b17005d..9f1ccd3082d 100644 --- a/networking/eth2/build.gradle +++ b/networking/eth2/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation 'io.libp2p:jvm-libp2p' implementation 'io.netty:netty-codec-http' - implementation 'org.apache.tuweni:tuweni-ssz' + implementation 'io.tmio:tuweni-ssz' implementation 'org.xerial.snappy:snappy-java' testImplementation testFixtures(project(':infrastructure:metrics')) diff --git a/networking/p2p/build.gradle b/networking/p2p/build.gradle index 3117d70ee21..249e25c194c 100644 --- a/networking/p2p/build.gradle +++ b/networking/p2p/build.gradle @@ -20,8 +20,8 @@ dependencies { implementation 'io.libp2p:jvm-libp2p' implementation 'io.netty:netty-handler' implementation 'io.projectreactor:reactor-core' - implementation 'org.apache.tuweni:tuweni-units' - implementation 'org.apache.tuweni:tuweni-crypto' + implementation 'io.tmio:tuweni-units' + implementation 'io.tmio:tuweni-crypto' implementation 'tech.pegasys.discovery:discovery' testImplementation testFixtures(project(':ethereum:statetransition')) @@ -32,7 +32,7 @@ dependencies { testImplementation 'org.hyperledger.besu.internal:metrics-core' - testFixturesApi 'org.apache.tuweni:tuweni-bytes' + testFixturesApi 'io.tmio:tuweni-bytes' testFixturesCompileOnly 'org.jetbrains.kotlin:kotlin-stdlib' diff --git a/services/executionlayer/build.gradle b/services/executionlayer/build.gradle index e8514d86122..3561b902efe 100644 --- a/services/executionlayer/build.gradle +++ b/services/executionlayer/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation project(':infrastructure:serviceutils') implementation project(':validator:client') - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation testFixtures(project(':ethereum:spec')) } \ No newline at end of file diff --git a/services/powchain/build.gradle b/services/powchain/build.gradle index 46eca84490f..942c2219abe 100644 --- a/services/powchain/build.gradle +++ b/services/powchain/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation project(':infrastructure:serviceutils') implementation project(':validator:client') - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-units' testImplementation project(':ethereum:pow:merkletree') diff --git a/storage/api/build.gradle b/storage/api/build.gradle index 7be498e6d10..cc0a791e2be 100644 --- a/storage/api/build.gradle +++ b/storage/api/build.gradle @@ -4,7 +4,7 @@ dependencies { implementation project(':ethereum:pow:api') implementation project(':ethereum:spec') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' } publishing { diff --git a/storage/build.gradle b/storage/build.gradle index fd19d858348..2f5febe79ed 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' implementation 'io.prometheus:simpleclient' - implementation 'org.apache.tuweni:tuweni-ssz' + implementation 'io.tmio:tuweni-ssz' implementation 'org.hyperledger.besu.internal:metrics-core' implementation 'org.hyperledger.besu:plugin-api' implementation 'org.rocksdb:rocksdbjni' @@ -64,7 +64,7 @@ dependencies { testFixturesImplementation 'org.junit.jupiter:junit-jupiter-api' testFixturesImplementation 'org.junit.jupiter:junit-jupiter-params' testFixturesImplementation 'com.google.guava:guava' - testFixturesImplementation 'org.apache.tuweni:tuweni-bytes' + testFixturesImplementation 'io.tmio:tuweni-bytes' testFixturesImplementation 'org.hyperledger.besu.internal:metrics-core' testFixturesImplementation 'org.hyperledger.besu:plugin-api' diff --git a/teku/build.gradle b/teku/build.gradle index 28937b2033d..8efcf968ceb 100644 --- a/teku/build.gradle +++ b/teku/build.gradle @@ -52,8 +52,8 @@ dependencies { implementation 'io.vertx:vertx-core' implementation 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'org.apache.logging.log4j:log4j-slf4j2-impl' - implementation 'org.apache.tuweni:tuweni-ssz' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'io.tmio:tuweni-ssz' + implementation 'io.tmio:tuweni-units' implementation 'org.hyperledger.besu.internal:metrics-core' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' diff --git a/validator/beaconnode/build.gradle b/validator/beaconnode/build.gradle index 0fef9cf2e57..ff770ea9be7 100644 --- a/validator/beaconnode/build.gradle +++ b/validator/beaconnode/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation project(':validator:api') implementation project(':data:serializer') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' implementation 'com.google.guava:guava' implementation 'org.apache.logging.log4j:log4j-api' diff --git a/validator/client/build.gradle b/validator/client/build.gradle index 04d7bb23a60..64cc30b7181 100644 --- a/validator/client/build.gradle +++ b/validator/client/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation project(':infrastructure:bls-keystore') implementation project(':infrastructure:subscribers') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' implementation 'commons-io:commons-io' implementation 'com.fasterxml.jackson.core:jackson-databind' diff --git a/validator/eventadapter/build.gradle b/validator/eventadapter/build.gradle index 7548edfc9f9..400d88b2973 100644 --- a/validator/eventadapter/build.gradle +++ b/validator/eventadapter/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation project(':validator:api') implementation project(':validator:beaconnode') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'io.tmio:tuweni-bytes' implementation 'com.google.guava:guava' implementation 'org.apache.logging.log4j:log4j-api'