diff --git a/acceptance-tests/tests/build.gradle b/acceptance-tests/tests/build.gradle
index 668463383b7..543ab645e4a 100644
--- a/acceptance-tests/tests/build.gradle
+++ b/acceptance-tests/tests/build.gradle
@@ -12,17 +12,8 @@
*/
plugins {
- id 'org.web3j' version '4.9.2'
- id 'org.web3j.solidity' version '0.3.5'
-}
-
-configurations.all {
- resolutionStrategy.eachDependency { DependencyResolveDetails details ->
- if (details.requested.group == 'org.web3j' && details.requested.version == '4.9.2') {
- details.useVersion '4.9.4'
- details.because 'Plugin version is 4.9.2 (latest), but we want it to use web3j libs version 4.9.4'
- }
- }
+ id 'org.web3j' version '4.11.1'
+ id 'org.web3j.solidity' version '0.4.0'
}
web3j { generatedPackageName = 'org.hyperledger.besu.tests.web3j.generated' }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java
index 419286f1689..e1bb0a980ea 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java
@@ -187,6 +187,10 @@ public void aliceCanUsePrivDistributeTransaction() {
EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
? "0x3e5d325a03ad3ce5640502219833d30b89ce3ce1"
: "0xebf56429e6500e84442467292183d4d621359838";
+ final String receiptPrivacyGroupId =
+ EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+ ? "MjuFB4b9Hz+f8zvkWWasxZWRjHWXU4t7B2nOHo4mekA="
+ : "DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=";
final RawPrivateTransaction rawPrivateTransaction =
RawPrivateTransaction.createContractTransaction(
@@ -196,6 +200,7 @@ public void aliceCanUsePrivDistributeTransaction() {
Numeric.prependHexPrefix(EventEmitter.BINARY),
Base64String.wrap(alice.getEnclaveKey()),
Collections.singletonList(Base64String.wrap(bob.getEnclaveKey())),
+ Base64String.wrap(receiptPrivacyGroupId),
RESTRICTED);
final String signedPrivateTransaction =
@@ -243,10 +248,6 @@ public void aliceCanUsePrivDistributeTransaction() {
"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEXIgZqRA25V+3nN+Do6b5r0jiUunub6ubjPhqwHpPxP44uUYh9RKCQNRnsqCJ9PjeTnC8R3ieJk7HWAlycU1bug=="))
: new ArrayList<>(
Collections.singletonList("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs="));
- final String receiptPrivacyGroupId =
- EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
- ? "MjuFB4b9Hz+f8zvkWWasxZWRjHWXU4t7B2nOHo4mekA="
- : "DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=";
final PrivateTransactionReceipt expectedReceipt =
new PrivateTransactionReceipt(
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 9d36f782098..6ab41da705d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -106,16 +106,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -126,21 +116,16 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -196,14 +181,6 @@
-
-
-
-
-
-
-
-
@@ -220,6 +197,14 @@
+
+
+
+
+
+
+
+
@@ -228,14 +213,6 @@
-
-
-
-
-
-
-
-
@@ -252,6 +229,14 @@
+
+
+
+
+
+
+
+
@@ -260,19 +245,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -289,6 +261,14 @@
+
+
+
+
+
+
+
+
@@ -521,12 +501,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -3460,14 +3440,6 @@
-
-
-
-
-
-
-
-
@@ -3476,6 +3448,14 @@
+
+
+
+
+
+
+
+
@@ -4797,12 +4777,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -4859,9 +4839,6 @@
-
-
-
@@ -4896,9 +4873,6 @@
-
-
-
@@ -4921,14 +4895,6 @@
-
-
-
-
-
-
-
-
@@ -4959,9 +4925,6 @@
-
-
-
@@ -5596,14 +5559,6 @@
-
-
-
-
-
-
-
-
@@ -5620,11 +5575,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5633,11 +5601,6 @@
-
-
-
-
-
@@ -5648,6 +5611,11 @@
+
+
+
+
+
@@ -5726,198 +5694,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
@@ -5976,6 +5880,14 @@
+
+
+
+
+
+
+
+
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index dbe70c1d608..0efaf6e3fec 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -217,8 +217,8 @@ dependencyManagement {
dependency 'org.testcontainers:testcontainers:1.19.3'
- dependency 'org.web3j:quorum:4.9.5'
- dependencySet(group: 'org.web3j', version: '4.10.3') {
+ dependency 'org.web3j:quorum:4.10.0'
+ dependencySet(group: 'org.web3j', version: '4.11.1') {
entry 'abi'
entry 'besu'
entry 'core'
diff --git a/settings.gradle b/settings.gradle
index 15a0f8617d6..c3c25b6eb3e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,6 +17,10 @@
pluginManagement {
repositories {
gradlePluginPortal()
+ maven {
+ url 'https://artifacts.consensys.net/public/maven/maven/'
+ content { includeGroupByRegex('tech\\.pegasys(\\..*)?') }
+ }
}
}