upgrade tuweni to 2.3.0 (#4464)

* upgrade tuweni to 2.3.0

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

* Add guava dependency explicitly

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

* spotless

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

* add antlr dependency

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

* upgrade antlr and graphql-java

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

* fix graphql validation messages

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

* remove staged repo

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

crypto/build.gradle

@@ -40,6 +40,7 @@ dependencies {
   implementation 'org.hyperledger.besu:secp256k1'
   implementation 'org.hyperledger.besu:secp256r1'
   implementation 'org.hyperledger.besu:blake2bf'
+  implementation 'com.google.guava:guava'
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'

datatypes/build.gradle

@@ -35,6 +35,7 @@ dependencies {
 
   implementation project(':crypto')
   implementation project(':ethereum:rlp')
+  implementation 'com.google.guava:guava'
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'

ethereum/api/build.gradle

@@ -66,6 +66,7 @@ dependencies {
   implementation 'org.apache.tuweni:tuweni-net'
   implementation 'org.apache.tuweni:tuweni-toml'
   implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.antlr:antlr4-runtime'
   implementation 'org.bouncycastle:bcprov-jdk15on'
   implementation 'org.springframework.security:spring-security-crypto'
   implementation 'org.xerial.snappy:snappy-java'

ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json

@@ -4,7 +4,7 @@
   "response": {
     "errors": [
       {
-        "message": "Validation error of type WrongType: argument 'data.data' with value 'StringValue{value='12a7b914'}' is not a valid 'Bytes' - Bytes value '12a7b914' is not prefixed with 0x @ 'block/call'",
+        "message": "Validation error (WrongType@[block/call]) : argument 'data.data' with value 'StringValue{value='12a7b914'}' is not a valid 'Bytes' - Bytes value '12a7b914' is not prefixed with 0x",
         "locations": [
           {
             "line": 1,

ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_without_addr.json

@@ -3,7 +3,7 @@
   "response": {
     "errors": [
       {
-        "message": "Validation error of type MissingFieldArgument: Missing field argument address @ 'pending/account'",
+        "message": "Validation error (MissingFieldArgument@[pending/account]) : Missing field argument 'address'",
         "locations": [
           {
             "line": 1,

ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash_InvalidHexBytes32Hash.json

@@ -3,7 +3,7 @@
   "response": {
     "errors": [
       {
-        "message": "Validation error of type WrongType: argument 'hash' with value 'StringValue{value='c8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6'}' is not a valid 'Bytes32' - Bytes32 value 'c8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6' is not prefixed with 0x @ 'block'",
+        "message": "Validation error (WrongType@[block]) : argument 'hash' with value 'StringValue{value='c8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6'}' is not a valid 'Bytes32' - Bytes32 value 'c8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6' is not prefixed with 0x",
         "locations": [
           {
             "line": 1,

ethereum/rlp/build.gradle

@@ -33,6 +33,8 @@ dependencies {
 
   implementation 'org.apache.tuweni:tuweni-bytes'
   implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'com.google.guava:guava'
+
 
   jmh project(':util')
 

evm/build.gradle

@@ -36,6 +36,7 @@ dependencies {
   implementation project(':crypto')
   implementation project(':datatypes')
   implementation project(':ethereum:rlp')
+  implementation 'com.google.guava:guava'
 
   compileOnly 'com.fasterxml.jackson.core:jackson-databind'
 

gradle/versions.gradle

@@ -16,6 +16,11 @@
 dependencyManagement {
   dependencies {
 
+    dependencySet(group: 'org.antlr', version: '4.10.1') {
+      entry 'antlr4'
+      entry 'antlr4-runtime'
+    }
+
     dependencySet(group:'com.fasterxml.jackson.core', version:'2.13.3') {
       entry 'jackson-databind'
       entry 'jackson-datatype'
@@ -45,7 +50,7 @@ dependencyManagement {
 
     dependency 'com.google.guava:guava:31.1-jre'
 
-    dependency 'com.graphql-java:graphql-java:18.1'
+    dependency 'com.graphql-java:graphql-java:19.2'
 
     dependency 'com.splunk.logging:splunk-library-javalogging:1.11.5'
 
@@ -124,17 +129,17 @@ dependencyManagement {
     dependency 'org.apache.logging.log4j:log4j-jul:2.17.2'
     dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2'
 
-    dependency 'org.apache.tuweni:tuweni-bytes:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-config:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-concurrent:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-crypto:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-devp2p:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-dns-discovery:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-io:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-net:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-rlp:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-toml:2.2.0'
-    dependency 'org.apache.tuweni:tuweni-units:2.2.0'
+    dependency 'org.apache.tuweni:tuweni-bytes:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-config:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-concurrent:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-crypto:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-devp2p:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-dns-discovery:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-io:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-net:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-rlp:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-toml:2.3.0'
+    dependency 'org.apache.tuweni:tuweni-units:2.3.0'
 
     dependency 'org.assertj:assertj-core:3.23.1'
 

services/kvstore/build.gradle

@@ -30,6 +30,7 @@ jar {
 dependencies {
   api project(':plugin-api')
   api 'org.slf4j:slf4j-api'
+  implementation 'com.google.guava:guava'
 
   testImplementation project(':testutil')
   testImplementation 'junit:junit'