GraphQL Support for withdrawals

CHANGELOG.md

@@ -13,7 +13,8 @@
 - New optional feature to save the txpool content to file on shutdown and reloading it on startup [#5434](https://github.com/hyperledger/besu/pull/5434)
 - New option to send SNI header in TLS ClientHello message [#5439](https://github.com/hyperledger/besu/pull/5439)
 - Early access - layered transaction pool implementation [#5290](https://github.com/hyperledger/besu/pull/5290)
-- New RPC method `debug_getRawReceipts`
+- New RPC method `debug_getRawReceipts` [#5476](https://github.com/hyperledger/besu/pull/5476)
+- Add support for Shanghai changes to the GraphQL service [#5496](https://github.com/hyperledger/besu/pull/5496)
 
 ### Bug Fixes
 - Fix eth_feeHistory response for the case in which blockCount is higher than highestBlock requested. [#5397](https://github.com/hyperledger/besu/pull/5397)

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java

@@ -17,8 +17,13 @@
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 
+import java.util.Locale;
+
+import graphql.GraphQLContext;
+import graphql.execution.CoercedVariables;
 import graphql.language.IntValue;
 import graphql.language.StringValue;
+import graphql.language.Value;
 import graphql.schema.Coercing;
 import graphql.schema.CoercingParseLiteralException;
 import graphql.schema.CoercingParseValueException;
@@ -35,19 +40,19 @@ private Scalars() {}
   private static final Coercing<Address, String> ADDRESS_COERCING =
       new Coercing<Address, String>() {
         Address convertImpl(final Object input) {
-          if (input instanceof Address) {
-            return (Address) input;
-          } else if (input instanceof Bytes) {
+          if (input instanceof Address address) {
+            return address;
+          } else if (input instanceof Bytes bytes) {
             if (((Bytes) input).size() <= 20) {
-              return Address.wrap((Bytes) input);
+              return Address.wrap(bytes);
             } else {
               return null;
             }
-          } else if (input instanceof StringValue) {
-            return convertImpl(((StringValue) input).getValue());
-          } else if (input instanceof String) {
+          } else if (input instanceof StringValue stringValue) {
+            return convertImpl(stringValue.getValue());
+          } else if (input instanceof String string) {
             try {
-              return Address.fromHexStringStrict((String) input);
+              return Address.fromHexStringStrict(string);
             } catch (IllegalArgumentException iae) {
               return null;
             }
@@ -57,7 +62,9 @@ Address convertImpl(final Object input) {
         }
 
         @Override
-        public String serialize(final Object input) throws CoercingSerializeException {
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
           Address result = convertImpl(input);
           if (result != null) {
             return result.toHexString();
@@ -67,7 +74,9 @@ public String serialize(final Object input) throws CoercingSerializeException {
         }
 
         @Override
-        public Address parseValue(final Object input) throws CoercingParseValueException {
+        public Address parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
           Address result = convertImpl(input);
           if (result != null) {
             return result;
@@ -78,7 +87,12 @@ public Address parseValue(final Object input) throws CoercingParseValueException
         }
 
         @Override
-        public Address parseLiteral(final Object input) throws CoercingParseLiteralException {
+        public Address parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
           Address result = convertImpl(input);
           if (result != null) {
             return result;
@@ -92,25 +106,27 @@ public Address parseLiteral(final Object input) throws CoercingParseLiteralExcep
       new Coercing<String, String>() {
 
         String convertImpl(final Object input) {
-          if (input instanceof String) {
+          if (input instanceof String string) {
             try {
-              return Bytes.fromHexStringLenient((String) input).toShortHexString();
+              return Bytes.fromHexStringLenient(string).toShortHexString();
             } catch (IllegalArgumentException iae) {
               return null;
             }
-          } else if (input instanceof Bytes) {
-            return ((Bytes) input).toShortHexString();
-          } else if (input instanceof StringValue) {
-            return convertImpl(((StringValue) input).getValue());
-          } else if (input instanceof IntValue) {
-            return UInt256.valueOf(((IntValue) input).getValue()).toShortHexString();
+          } else if (input instanceof Bytes bytes) {
+            return bytes.toShortHexString();
+          } else if (input instanceof StringValue stringValue) {
+            return convertImpl(stringValue.getValue());
+          } else if (input instanceof IntValue intValue) {
+            return UInt256.valueOf(intValue.getValue()).toShortHexString();
           } else {
             return null;
           }
         }
 
         @Override
-        public String serialize(final Object input) throws CoercingSerializeException {
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
           var result = convertImpl(input);
           if (result != null) {
             return result;
@@ -120,7 +136,9 @@ public String serialize(final Object input) throws CoercingSerializeException {
         }
 
         @Override
-        public String parseValue(final Object input) throws CoercingParseValueException {
+        public String parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
           var result = convertImpl(input);
           if (result != null) {
             return result;
@@ -131,7 +149,12 @@ public String parseValue(final Object input) throws CoercingParseValueException
         }
 
         @Override
-        public String parseLiteral(final Object input) throws CoercingParseLiteralException {
+        public String parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
           var result = convertImpl(input);
           if (result != null) {
             return result;
@@ -145,12 +168,12 @@ public String parseLiteral(final Object input) throws CoercingParseLiteralExcept
       new Coercing<Bytes, String>() {
 
         Bytes convertImpl(final Object input) {
-          if (input instanceof Bytes) {
-            return (Bytes) input;
-          } else if (input instanceof StringValue) {
-            return convertImpl(((StringValue) input).getValue());
-          } else if (input instanceof String) {
-            if (!Quantity.isValid((String) input)) {
+          if (input instanceof Bytes bytes) {
+            return bytes;
+          } else if (input instanceof StringValue stringValue) {
+            return convertImpl(stringValue.getValue());
+          } else if (input instanceof String string) {
+            if (!Quantity.isValid(string)) {
               throw new CoercingParseLiteralException(
                   "Bytes value '" + input + "' is not prefixed with 0x");
             }
@@ -165,7 +188,9 @@ Bytes convertImpl(final Object input) {
         }
 
         @Override
-        public String serialize(final Object input) throws CoercingSerializeException {
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
           var result = convertImpl(input);
           if (result != null) {
             return result.toHexString();
@@ -175,7 +200,9 @@ public String serialize(final Object input) throws CoercingSerializeException {
         }
 
         @Override
-        public Bytes parseValue(final Object input) throws CoercingParseValueException {
+        public Bytes parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
           var result = convertImpl(input);
           if (result != null) {
             return result;
@@ -186,7 +213,12 @@ public Bytes parseValue(final Object input) throws CoercingParseValueException {
         }
 
         @Override
-        public Bytes parseLiteral(final Object input) throws CoercingParseLiteralException {
+        public Bytes parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
           var result = convertImpl(input);
           if (result != null) {
             return result;
@@ -200,18 +232,18 @@ public Bytes parseLiteral(final Object input) throws CoercingParseLiteralExcepti
       new Coercing<Bytes32, String>() {
 
         Bytes32 convertImpl(final Object input) {
-          if (input instanceof Bytes32) {
-            return (Bytes32) input;
-          } else if (input instanceof Bytes) {
-            if (((Bytes) input).size() <= 32) {
+          if (input instanceof Bytes32 bytes32) {
+            return bytes32;
+          } else if (input instanceof Bytes bytes) {
+            if (bytes.size() <= 32) {
               return Bytes32.leftPad((Bytes) input);
             } else {
               return null;
             }
-          } else if (input instanceof StringValue) {
-            return convertImpl((((StringValue) input).getValue()));
-          } else if (input instanceof String) {
-            if (!Quantity.isValid((String) input)) {
+          } else if (input instanceof StringValue stringValue) {
+            return convertImpl(stringValue.getValue());
+          } else if (input instanceof String string) {
+            if (!Quantity.isValid(string)) {
               throw new CoercingParseLiteralException(
                   "Bytes32 value '" + input + "' is not prefixed with 0x");
             } else {
@@ -227,7 +259,9 @@ Bytes32 convertImpl(final Object input) {
         }
 
         @Override
-        public String serialize(final Object input) throws CoercingSerializeException {
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
           var result = convertImpl(input);
           if (result == null) {
             throw new CoercingSerializeException("Unable to serialize " + input + " as an Bytes32");
@@ -237,7 +271,9 @@ public String serialize(final Object input) throws CoercingSerializeException {
         }
 
         @Override
-        public Bytes32 parseValue(final Object input) throws CoercingParseValueException {
+        public Bytes32 parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
           var result = convertImpl(input);
           if (result == null) {
             throw new CoercingParseValueException(
@@ -248,7 +284,12 @@ public Bytes32 parseValue(final Object input) throws CoercingParseValueException
         }
 
         @Override
-        public Bytes32 parseLiteral(final Object input) throws CoercingParseLiteralException {
+        public Bytes32 parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
           var result = convertImpl(input);
           if (result == null) {
             throw new CoercingParseLiteralException("Value is not any Bytes32 : '" + input + "'");
@@ -259,13 +300,15 @@ public Bytes32 parseLiteral(final Object input) throws CoercingParseLiteralExcep
       };
 
   private static final Coercing<Number, Number> LONG_COERCING =
-      new Coercing<Number, Number>() {
+      new Coercing<>() {
         @Override
-        public Number serialize(final Object input) throws CoercingSerializeException {
-          if (input instanceof Number) {
-            return (Number) input;
-          } else if (input instanceof String) {
-            final String value = ((String) input).toLowerCase();
+        public Number serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
+          if (input instanceof Number number) {
+            return number;
+          } else if (input instanceof String string) {
+            final String value = string.toLowerCase();
             if (value.startsWith("0x")) {
               return Bytes.fromHexStringLenient(value).toLong();
             } else {
@@ -276,11 +319,13 @@ public Number serialize(final Object input) throws CoercingSerializeException {
         }
 
         @Override
-        public Number parseValue(final Object input) throws CoercingParseValueException {
-          if (input instanceof Number) {
-            return (Number) input;
-          } else if (input instanceof String) {
-            final String value = ((String) input).toLowerCase();
+        public Number parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
+          if (input instanceof Number number) {
+            return number;
+          } else if (input instanceof String string) {
+            final String value = string.toLowerCase();
             if (value.startsWith("0x")) {
               return Bytes.fromHexStringLenient(value).toLong();
             } else {
@@ -292,12 +337,17 @@ public Number parseValue(final Object input) throws CoercingParseValueException
         }
 
         @Override
-        public Number parseLiteral(final Object input) throws CoercingParseLiteralException {
+        public Number parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
           try {
-            if (input instanceof IntValue) {
-              return ((IntValue) input).getValue().longValue();
-            } else if (input instanceof StringValue) {
-              final String value = ((StringValue) input).getValue().toLowerCase();
+            if (input instanceof IntValue intValue) {
+              return intValue.getValue().longValue();
+            } else if (input instanceof StringValue stringValue) {
+              final String value = stringValue.getValue().toLowerCase();
               if (value.startsWith("0x")) {
                 return Bytes.fromHexStringLenient(value).toLong();
               } else {

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java

@@ -41,24 +41,26 @@ public AccountAdapter(final Address address, final Account account) {
     this.address = address;
   }
 
-  public Optional<Address> getAddress() {
-    return Optional.of(address);
+  public Address getAddress() {
+    return address;
   }
 
-  public Optional<Wei> getBalance() {
-    return account.map(AccountState::getBalance).or(() -> Optional.of(Wei.ZERO));
+  public Wei getBalance() {
+    return account.map(AccountState::getBalance).orElse(Wei.ZERO);
   }
 
-  public Optional<Long> getTransactionCount() {
-    return account.map(AccountState::getNonce).or(() -> Optional.of(0L));
+  public Long getTransactionCount() {
+    return account.map(AccountState::getNonce).orElse(0L);
   }
 
-  public Optional<Bytes> getCode() {
-    return account.map(AccountState::getCode);
+  public Bytes getCode() {
+    return account.map(AccountState::getCode).orElse(Bytes.EMPTY);
   }
 
-  public Optional<Bytes32> getStorage(final DataFetchingEnvironment environment) {
+  public Bytes32 getStorage(final DataFetchingEnvironment environment) {
     final Bytes32 slot = environment.getArgument("slot");
-    return account.map(account -> account.getStorageValue(UInt256.fromBytes(slot)));
+    return account
+        .map(a -> (Bytes32) a.getStorageValue(UInt256.fromBytes(slot)))
+        .orElse(Bytes32.ZERO);
   }
 }