From 6709100b5fd7edb0b94cb2be52c2335f05bb0051 Mon Sep 17 00:00:00 2001 From: Stefan Bratanov Date: Wed, 24 Apr 2024 09:48:56 +0100 Subject: [PATCH] Rename DepositReceiptV1 to DepositRequestV1 --- .../web3j/Web3JExecutionEngineClientTest.java | 4 +-- ...itReceiptV1.java => DepositRequestV1.java} | 4 +-- .../schema/ExecutionPayloadV4.java | 36 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) rename ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/{DepositReceiptV1.java => DepositRequestV1.java} (97%) diff --git a/ethereum/executionclient/src/integration-test/java/tech/pegasys/teku/ethereum/executionclient/web3j/Web3JExecutionEngineClientTest.java b/ethereum/executionclient/src/integration-test/java/tech/pegasys/teku/ethereum/executionclient/web3j/Web3JExecutionEngineClientTest.java index 1a944e16d41..19b1d83574f 100644 --- a/ethereum/executionclient/src/integration-test/java/tech/pegasys/teku/ethereum/executionclient/web3j/Web3JExecutionEngineClientTest.java +++ b/ethereum/executionclient/src/integration-test/java/tech/pegasys/teku/ethereum/executionclient/web3j/Web3JExecutionEngineClientTest.java @@ -344,9 +344,9 @@ public void newPayloadV4_shouldBuildRequestAndResponseSuccessfully() { assertThat(executionPayloadV4Parameter.get("parentHash")) .isEqualTo(executionPayloadV4.parentHash.toHexString()); - assertThat(executionPayloadV4Parameter.get("depositReceipts")) + assertThat(executionPayloadV4Parameter.get("depositRequests")) .asInstanceOf(InstanceOfAssertFactories.LIST) - .hasSameSizeAs(executionPayloadV4.depositReceipts); + .hasSameSizeAs(executionPayloadV4.depositRequests); assertThat(executionPayloadV4Parameter.get("withdrawalRequests")) .asInstanceOf(InstanceOfAssertFactories.LIST) .hasSameSizeAs(executionPayloadV4.withdrawalRequests); diff --git a/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/DepositReceiptV1.java b/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/DepositRequestV1.java similarity index 97% rename from ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/DepositReceiptV1.java rename to ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/DepositRequestV1.java index 7d2b70f0ac8..441af459c4a 100644 --- a/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/DepositReceiptV1.java +++ b/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/DepositRequestV1.java @@ -27,7 +27,7 @@ import tech.pegasys.teku.ethereum.executionclient.serialization.UInt64AsHexSerializer; import tech.pegasys.teku.infrastructure.unsigned.UInt64; -public class DepositReceiptV1 { +public class DepositRequestV1 { @JsonSerialize(using = BytesSerializer.class) @JsonDeserialize(using = Bytes48Deserializer.class) public final Bytes48 pubkey; @@ -48,7 +48,7 @@ public class DepositReceiptV1 { @JsonDeserialize(using = UInt64AsHexDeserializer.class) public final UInt64 index; - public DepositReceiptV1( + public DepositRequestV1( @JsonProperty("pubkey") final Bytes48 pubkey, @JsonProperty("withdrawalCredentials") final Bytes32 withdrawalCredentials, @JsonProperty("amount") final UInt64 amount, diff --git a/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV4.java b/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV4.java index 2fadd870d29..64b7e4f837a 100644 --- a/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV4.java +++ b/ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV4.java @@ -37,7 +37,7 @@ import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionPayloadElectra; public class ExecutionPayloadV4 extends ExecutionPayloadV3 { - public final List depositReceipts; + public final List depositRequests; public final List withdrawalRequests; public ExecutionPayloadV4( @@ -58,7 +58,7 @@ public ExecutionPayloadV4( final @JsonProperty("withdrawals") List withdrawals, final @JsonProperty("blobGasUsed") UInt64 blobGasUsed, final @JsonProperty("excessBlobGas") UInt64 excessBlobGas, - final @JsonProperty("depositReceipts") List depositReceipts, + final @JsonProperty("depositRequests") List depositRequests, final @JsonProperty("withdrawalRequests") List withdrawalRequests) { super( parentHash, @@ -78,7 +78,7 @@ public ExecutionPayloadV4( withdrawals, blobGasUsed, excessBlobGas); - this.depositReceipts = depositReceipts; + this.depositRequests = depositRequests; this.withdrawalRequests = withdrawalRequests; } @@ -104,7 +104,7 @@ public static ExecutionPayloadV4 fromInternalExecutionPayload( withdrawalsList, executionPayload.toVersionDeneb().map(ExecutionPayloadDeneb::getBlobGasUsed).orElse(null), executionPayload.toVersionDeneb().map(ExecutionPayloadDeneb::getExcessBlobGas).orElse(null), - getDepositReceipts( + getDepositRequests( executionPayload.toVersionElectra().map(ExecutionPayloadElectra::getDepositReceipts)), getWithdrawalRequests( executionPayload @@ -119,10 +119,10 @@ protected ExecutionPayloadBuilder applyToBuilder( return super.applyToBuilder(executionPayloadSchema, builder) .depositReceipts( () -> - checkNotNull(depositReceipts, "depositReceipts not provided when required").stream() + checkNotNull(depositRequests, "depositRequests not provided when required").stream() .map( - depositReceiptV1 -> - createInternalDepositReceipt(depositReceiptV1, executionPayloadSchema)) + depositRequestV1 -> + createInternalDepositReceipt(depositRequestV1, executionPayloadSchema)) .toList()) .withdrawalRequests( () -> @@ -136,16 +136,16 @@ protected ExecutionPayloadBuilder applyToBuilder( } private DepositReceipt createInternalDepositReceipt( - final DepositReceiptV1 depositReceiptV1, + final DepositRequestV1 depositRequestV1, final ExecutionPayloadSchema executionPayloadSchema) { return executionPayloadSchema .getDepositReceiptSchemaRequired() .create( - BLSPublicKey.fromBytesCompressed(depositReceiptV1.pubkey), - depositReceiptV1.withdrawalCredentials, - depositReceiptV1.amount, - BLSSignature.fromBytesCompressed(depositReceiptV1.signature), - depositReceiptV1.index); + BLSPublicKey.fromBytesCompressed(depositRequestV1.pubkey), + depositRequestV1.withdrawalCredentials, + depositRequestV1.amount, + BLSSignature.fromBytesCompressed(depositRequestV1.signature), + depositRequestV1.index); } private ExecutionLayerWithdrawalRequest createInternalWithdrawalRequest( @@ -159,24 +159,24 @@ private ExecutionLayerWithdrawalRequest createInternalWithdrawalRequest( withdrawalRequestV1.amount); } - public static List getDepositReceipts( + public static List getDepositRequests( final Optional> maybeDepositReceipts) { if (maybeDepositReceipts.isEmpty()) { return List.of(); } - final List depositReceipts = new ArrayList<>(); + final List depositRequests = new ArrayList<>(); for (DepositReceipt depositReceipt : maybeDepositReceipts.get()) { - depositReceipts.add( - new DepositReceiptV1( + depositRequests.add( + new DepositRequestV1( depositReceipt.getPubkey().toBytesCompressed(), depositReceipt.getWithdrawalCredentials(), depositReceipt.getAmount(), depositReceipt.getSignature().toBytesCompressed(), depositReceipt.getIndex())); } - return depositReceipts; + return depositRequests; } public static List getWithdrawalRequests(