Update Web3j dependencies

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
hyperledger · Mar 26, 2024 · 85c9ee2 · 85c9ee2
1 parent 02dd244
commit 85c9ee2
Show file tree

Hide file tree

Showing 5 changed files with 168 additions and 260 deletions.
diff --git 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/...test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java b/...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(