EIP-6110: Add deposit validation and apis

config/src/main/resources/experimental.json

@@ -35,5 +35,6 @@
       "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
       "balance": "90000000000000000000000"
     }
-  }
+  },
+  "depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa"
 }

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV2Test.java

@@ -104,20 +104,6 @@ public void shouldReturnExecutionPayloadWithoutWithdrawals_PreShanghaiBlock() {
               assertThat(r.getResult()).isInstanceOf(EngineGetPayloadResultV2.class);
               final EngineGetPayloadResultV2 res = (EngineGetPayloadResultV2) r.getResult();
               assertThat(res.getExecutionPayload().getWithdrawals()).isNull();
-            });
-    verify(engineCallListener, times(1)).executionEngineCalled();
-  }
-
-  @Test
-  public void shouldReturnExecutionPayloadWithoutDeposits_PreShanghaiBlock() {
-    final var resp = resp(RpcMethod.ENGINE_GET_PAYLOAD_V2.getMethodName(), mockPid);
-    assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
-    Optional.of(resp)
-        .map(JsonRpcSuccessResponse.class::cast)
-        .ifPresent(
-            r -> {
-              assertThat(r.getResult()).isInstanceOf(EngineGetPayloadResultV2.class);
-              final EngineGetPayloadResultV2 res = (EngineGetPayloadResultV2) r.getResult();
               assertThat(res.getExecutionPayload().getDeposits()).isNull();
             });
     verify(engineCallListener, times(1)).executionEngineCalled();

ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java

@@ -204,6 +204,7 @@ protected BlockCreationResult createBlock(
         final List<Deposit> depositsFromReceipts =
             transactionResults.getReceipts().stream()
                 .flatMap(receipt -> receipt.getLogsList().stream())
+                .filter(log -> true) // TODO: Figure out how to get the deposit contract address
                 .map(DepositDecoder::decodeFromLog)
                 .toList();
         maybeDeposits = Optional.of(depositsFromReceipts);

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/DepositContract.java

@@ -42,7 +42,7 @@ public class DepositContract extends Contract {
               new TypeReference<DynamicBytes>() {},
               new TypeReference<DynamicBytes>() {}));
 
-  protected DepositContract(
+  private DepositContract(
       final String contractBinary,
       final String contractAddress,
       final Web3j web3j,

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositDecoder.java

@@ -28,6 +28,8 @@
 import org.apache.tuweni.units.bigints.UInt64;
 import org.web3j.tx.Contract;
 
+import java.nio.ByteOrder;
+
 public class DepositDecoder {
 
   public static Deposit decode(final RLPInput rlpInput) {
@@ -53,12 +55,13 @@ public static Deposit decodeFromLog(final Log log) {
     return new Deposit(
         BLSPublicKey.wrap(Bytes.wrap(rawPublicKey)),
         Bytes32.wrap(Bytes.wrap(rawWithdrawalCredential)),
-        GWei.of(Bytes.wrap(rawAmount).reverse().toLong()),
+        GWei.of(Bytes.wrap(rawAmount).toLong(ByteOrder.LITTLE_ENDIAN)), // Amount is little endian as per Deposit Contract
         BLSSignature.wrap(Bytes.wrap(rawSignature)),
         UInt64.valueOf(Bytes.wrap(rawIndex).reverse().toLong()));
   }
 
   public static Deposit decodeOpaqueBytes(final Bytes input) {
     return decode(RLP.input(input));
   }
+
 }

ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/DepositDecoderTest.java

@@ -55,18 +55,29 @@ void shouldDecodeDeposit() {
 
   @Test
   void shouldDecodeDepositFromLog() {
-    Address address = Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa");
-    List<LogTopic> topics =
+    final Address address = Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa");
+    final List<LogTopic> topics =
         List.of(
             LogTopic.fromHexString(
                 "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"));
-    Bytes data =
+    final Bytes data =
         Bytes.fromHexString(
             "0x00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030b10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483000000000000000000000000000000000000000000000000000000000000000800405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb500000000000000000000000000000000000000000000000000000000000000083f3d080000000000000000000000000000000000000000000000000000000000");
 
-    Log log = new Log(address, data, topics);
-    Deposit deposit = DepositDecoder.decodeFromLog(log);
+    final Log log = new Log(address, data, topics);
+    final Deposit deposit = DepositDecoder.decodeFromLog(log);
 
-    System.out.println(deposit);
+    final Deposit expectedDeposit =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.ONE);
+
+    assertThat(deposit).isEqualTo(expectedDeposit);
   }
 }

ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DepositsValidatorTest.java

@@ -49,7 +49,6 @@ public class DepositsValidatorTest {
 
   @BeforeAll
   public static void setup() {
-    System.out.println("setting");
     DEPOSIT_1 =
         new Deposit(
             BLSPublicKey.fromHexString(