Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename DepositReceiptV1 to DepositRequestV1 #8245

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Rename DepositReceiptV1 to DepositRequestV1 #8245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...java/tech/pegasys/teku/ethereum/executionclient/web3j/Web3JExecutionEngineClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...cutionclient/schema/DepositReceiptV1.java → ...cutionclient/schema/DepositRequestV1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down
36 changes: 18 additions & 18 deletions ...t/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionPayloadElectra;

public class ExecutionPayloadV4 extends ExecutionPayloadV3 {
public final List<DepositReceiptV1> depositReceipts;
public final List<DepositRequestV1> depositRequests;
public final List<WithdrawalRequestV1> withdrawalRequests;

public ExecutionPayloadV4(
Expand All @@ -58,7 +58,7 @@ public ExecutionPayloadV4(
final @JsonProperty("withdrawals") List<WithdrawalV1> withdrawals,
final @JsonProperty("blobGasUsed") UInt64 blobGasUsed,
final @JsonProperty("excessBlobGas") UInt64 excessBlobGas,
final @JsonProperty("depositReceipts") List<DepositReceiptV1> depositReceipts,
final @JsonProperty("depositRequests") List<DepositRequestV1> depositRequests,
final @JsonProperty("withdrawalRequests") List<WithdrawalRequestV1> withdrawalRequests) {
super(
parentHash,
Expand All @@ -78,7 +78,7 @@ public ExecutionPayloadV4(
withdrawals,
blobGasUsed,
excessBlobGas);
this.depositReceipts = depositReceipts;
this.depositRequests = depositRequests;
this.withdrawalRequests = withdrawalRequests;
}

Expand All @@ -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
Expand All @@ -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(
() ->
Expand All @@ -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(
Expand All @@ -159,24 +159,24 @@ private ExecutionLayerWithdrawalRequest createInternalWithdrawalRequest(
withdrawalRequestV1.amount);
}

public static List<DepositReceiptV1> getDepositReceipts(
public static List<DepositRequestV1> getDepositRequests(
final Optional<SszList<DepositReceipt>> maybeDepositReceipts) {
if (maybeDepositReceipts.isEmpty()) {
return List.of();
}

final List<DepositReceiptV1> depositReceipts = new ArrayList<>();
final List<DepositRequestV1> 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<WithdrawalRequestV1> getWithdrawalRequests(
Expand Down