Skip to content

Commit

Permalink
random -> prevRandom rename to kilnV1 (#5061)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbenr
tbenr authored Feb 25, 2022
1 parent c4f2145 commit ea3db51
Show file tree
Hide file tree
Showing 2 changed files with 303 additions and 345 deletions.
343 changes: 0 additions & 343 deletions ...va/tech/pegasys/teku/ethereum/executionlayer/client/KilnV1Web3JExecutionEngineClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,11 @@

package tech.pegasys.teku.ethereum.executionlayer.client;

import static com.google.common.base.Preconditions.checkNotNull;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.base.MoreObjects;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import org.apache.tuweni.bytes.Bytes;
import org.apache.tuweni.bytes.Bytes32;
import org.apache.tuweni.units.bigints.UInt256;
import org.web3j.protocol.core.Request;
import tech.pegasys.teku.ethereum.executionlayer.client.schema.ExecutionPayloadV1;
import tech.pegasys.teku.ethereum.executionlayer.client.schema.ForkChoiceStateV1;
import tech.pegasys.teku.ethereum.executionlayer.client.schema.ForkChoiceUpdatedResult;
import tech.pegasys.teku.ethereum.executionlayer.client.schema.PayloadAttributesV1;
import tech.pegasys.teku.ethereum.executionlayer.client.schema.PayloadStatusV1;
import tech.pegasys.teku.ethereum.executionlayer.client.schema.Response;
import tech.pegasys.teku.ethereum.executionlayer.client.schema.TransitionConfigurationV1;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.Bytes20Deserializer;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.Bytes20Serializer;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.Bytes32Deserializer;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.BytesDeserializer;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.BytesSerializer;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.UInt256AsHexDeserializer;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.UInt256AsHexSerializer;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.UInt64AsHexDeserializer;
import tech.pegasys.teku.ethereum.executionlayer.client.serialization.UInt64AsHexSerializer;
import tech.pegasys.teku.infrastructure.async.SafeFuture;
import tech.pegasys.teku.infrastructure.ssz.type.Bytes20;
import tech.pegasys.teku.infrastructure.ssz.type.Bytes8;
import tech.pegasys.teku.infrastructure.time.TimeProvider;
import tech.pegasys.teku.infrastructure.unsigned.UInt64;

public class KilnV1Web3JExecutionEngineClient extends Web3JExecutionEngineClient {

Expand All @@ -60,317 +30,4 @@ public SafeFuture<Response<TransitionConfigurationV1>> exchangeTransitionConfigu
TransitionConfigurationV1 transitionConfiguration) {
return SafeFuture.completedFuture(new Response<>(transitionConfiguration));
}

@Override
public SafeFuture<Response<PayloadStatusV1>> newPayload(ExecutionPayloadV1 executionPayload) {
Request<?, NewPayloadWeb3jResponse> web3jRequest =
new Request<>(
"engine_newPayloadV1",
Collections.singletonList(
KilnV1ExecutionPayloadV1.fromExecutionPayloadV1(executionPayload)),
eeWeb3jService,
NewPayloadWeb3jResponse.class);
return doRequest(web3jRequest);
}

@Override
public SafeFuture<Response<ExecutionPayloadV1>> getPayload(Bytes8 payloadId) {
Request<?, KilnV1GetPayloadWeb3jResponse> web3jRequest =
new Request<>(
"engine_getPayloadV1",
Collections.singletonList(payloadId.toHexString()),
eeWeb3jService,
KilnV1GetPayloadWeb3jResponse.class);
return doRequest(web3jRequest).thenApply(this::fromKilnV1GetPayloadResponse);
}

private Response<ExecutionPayloadV1> fromKilnV1GetPayloadResponse(
final Response<KilnV1ExecutionPayloadV1> kintsugiResponse) {
if (kintsugiResponse.getPayload() == null) {
return new Response<>(kintsugiResponse.getErrorMessage());
}

return new Response<>(kintsugiResponse.getPayload().asExecutionPayloadV1());
}

@Override
public SafeFuture<Response<ForkChoiceUpdatedResult>> forkChoiceUpdated(
ForkChoiceStateV1 forkChoiceState, Optional<PayloadAttributesV1> payloadAttributes) {
Request<?, ForkChoiceUpdatedWeb3jResponse> web3jRequest =
new Request<>(
"engine_forkchoiceUpdatedV1",
list(
forkChoiceState,
payloadAttributes
.map(KilnV1PayloadAttributesV1::fromPayloadAttributesV1)
.orElse(null)),
eeWeb3jService,
ForkChoiceUpdatedWeb3jResponse.class);
return doRequest(web3jRequest);
}

public static class KilnV1ExecutionPayloadV1 {

@JsonSerialize(using = BytesSerializer.class)
@JsonDeserialize(using = Bytes32Deserializer.class)
public final Bytes32 parentHash;

@JsonSerialize(using = Bytes20Serializer.class)
@JsonDeserialize(using = Bytes20Deserializer.class)
public final Bytes20 feeRecipient;

@JsonSerialize(using = BytesSerializer.class)
@JsonDeserialize(using = Bytes32Deserializer.class)
public final Bytes32 stateRoot;

@JsonSerialize(using = BytesSerializer.class)
@JsonDeserialize(using = Bytes32Deserializer.class)
public final Bytes32 receiptsRoot;

@JsonSerialize(using = BytesSerializer.class)
@JsonDeserialize(using = BytesDeserializer.class)
public final Bytes logsBloom;

@JsonSerialize(using = BytesSerializer.class)
@JsonDeserialize(using = Bytes32Deserializer.class)
public final Bytes32 random;

@JsonSerialize(using = UInt64AsHexSerializer.class)
@JsonDeserialize(using = UInt64AsHexDeserializer.class)
public final UInt64 blockNumber;

@JsonSerialize(using = UInt64AsHexSerializer.class)
@JsonDeserialize(using = UInt64AsHexDeserializer.class)
public final UInt64 gasLimit;

@JsonSerialize(using = UInt64AsHexSerializer.class)
@JsonDeserialize(using = UInt64AsHexDeserializer.class)
public final UInt64 gasUsed;

@JsonSerialize(using = UInt64AsHexSerializer.class)
@JsonDeserialize(using = UInt64AsHexDeserializer.class)
public final UInt64 timestamp;

@JsonSerialize(using = BytesSerializer.class)
@JsonDeserialize(using = BytesDeserializer.class)
public final Bytes extraData;

@JsonSerialize(using = UInt256AsHexSerializer.class)
@JsonDeserialize(using = UInt256AsHexDeserializer.class)
public final UInt256 baseFeePerGas;

@JsonSerialize(using = BytesSerializer.class)
@JsonDeserialize(using = Bytes32Deserializer.class)
public final Bytes32 blockHash;

@JsonSerialize(contentUsing = BytesSerializer.class)
@JsonDeserialize(contentUsing = BytesDeserializer.class)
public final List<Bytes> transactions;

public KilnV1ExecutionPayloadV1(
@JsonProperty("parentHash") Bytes32 parentHash,
@JsonProperty("feeRecipient") Bytes20 feeRecipient,
@JsonProperty("stateRoot") Bytes32 stateRoot,
@JsonProperty("receiptsRoot") Bytes32 receiptsRoot,
@JsonProperty("logsBloom") Bytes logsBloom,
@JsonProperty("random") Bytes32 random,
@JsonProperty("blockNumber") UInt64 blockNumber,
@JsonProperty("gasLimit") UInt64 gasLimit,
@JsonProperty("gasUsed") UInt64 gasUsed,
@JsonProperty("timestamp") UInt64 timestamp,
@JsonProperty("extraData") Bytes extraData,
@JsonProperty("baseFeePerGas") UInt256 baseFeePerGas,
@JsonProperty("blockHash") Bytes32 blockHash,
@JsonProperty("transactions") List<Bytes> transactions) {
checkNotNull(parentHash, "parentHash");
checkNotNull(feeRecipient, "feeRecipient");
checkNotNull(stateRoot, "stateRoot");
checkNotNull(receiptsRoot, "receiptsRoot");
checkNotNull(logsBloom, "logsBloom");
checkNotNull(random, "random");
checkNotNull(blockNumber, "blockNumber");
checkNotNull(gasLimit, "gasLimit");
checkNotNull(gasUsed, "gasUsed");
checkNotNull(timestamp, "timestamp");
checkNotNull(extraData, "extraData");
checkNotNull(baseFeePerGas, "baseFeePerGas");
checkNotNull(blockHash, "blockHash");
this.parentHash = parentHash;
this.feeRecipient = feeRecipient;
this.stateRoot = stateRoot;
this.receiptsRoot = receiptsRoot;
this.logsBloom = logsBloom;
this.random = random;
this.blockNumber = blockNumber;
this.gasLimit = gasLimit;
this.gasUsed = gasUsed;
this.timestamp = timestamp;
this.extraData = extraData;
this.baseFeePerGas = baseFeePerGas;
this.blockHash = blockHash;
this.transactions = transactions != null ? transactions : List.of();
}

public ExecutionPayloadV1 asExecutionPayloadV1() {
return new ExecutionPayloadV1(
parentHash,
feeRecipient,
stateRoot,
receiptsRoot,
logsBloom,
random,
blockNumber,
gasLimit,
gasUsed,
timestamp,
extraData,
baseFeePerGas,
blockHash,
transactions);
}

public static KilnV1ExecutionPayloadV1 fromExecutionPayloadV1(
ExecutionPayloadV1 executionPayload) {
return new KilnV1ExecutionPayloadV1(
executionPayload.parentHash,
executionPayload.feeRecipient,
executionPayload.stateRoot,
executionPayload.receiptsRoot,
executionPayload.logsBloom,
executionPayload.prevRandao,
executionPayload.blockNumber,
executionPayload.gasLimit,
executionPayload.gasUsed,
executionPayload.timestamp,
executionPayload.extraData,
executionPayload.baseFeePerGas,
executionPayload.blockHash,
executionPayload.transactions);
}

@Override
public boolean equals(final Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
final KilnV1ExecutionPayloadV1 that = (KilnV1ExecutionPayloadV1) o;
return Objects.equals(parentHash, that.parentHash)
&& Objects.equals(feeRecipient, that.feeRecipient)
&& Objects.equals(stateRoot, that.stateRoot)
&& Objects.equals(receiptsRoot, that.receiptsRoot)
&& Objects.equals(logsBloom, that.logsBloom)
&& Objects.equals(random, that.random)
&& Objects.equals(blockNumber, that.blockNumber)
&& Objects.equals(gasLimit, that.gasLimit)
&& Objects.equals(gasUsed, that.gasUsed)
&& Objects.equals(timestamp, that.timestamp)
&& Objects.equals(extraData, that.extraData)
&& Objects.equals(baseFeePerGas, that.baseFeePerGas)
&& Objects.equals(blockHash, that.blockHash)
&& Objects.equals(transactions, that.transactions);
}

@Override
public int hashCode() {
return Objects.hash(
parentHash,
feeRecipient,
stateRoot,
receiptsRoot,
logsBloom,
random,
blockNumber,
gasLimit,
gasUsed,
timestamp,
extraData,
baseFeePerGas,
blockHash,
transactions);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("parentHash", parentHash)
.add("feeRecipient", feeRecipient)
.add("stateRoot", stateRoot)
.add("receiptsRoot", receiptsRoot)
.add("logsBloom", logsBloom)
.add("random", random)
.add("blockNumber", blockNumber)
.add("gasLimit", gasLimit)
.add("gasUsed", gasUsed)
.add("timestamp", timestamp)
.add("extraData", extraData)
.add("baseFeePerGas", baseFeePerGas)
.add("blockHash", blockHash)
.add("transactions", transactions)
.toString();
}
}

public static class KilnV1PayloadAttributesV1 {
@JsonSerialize(using = UInt64AsHexSerializer.class)
@JsonDeserialize(using = UInt64AsHexDeserializer.class)
private final UInt64 timestamp;

@JsonSerialize(using = BytesSerializer.class)
@JsonDeserialize(using = Bytes32Deserializer.class)
private final Bytes32 random;

@JsonSerialize(using = Bytes20Serializer.class)
@JsonDeserialize(using = Bytes20Deserializer.class)
private final Bytes20 suggestedFeeRecipient;

public KilnV1PayloadAttributesV1(
@JsonProperty("timestamp") UInt64 timestamp,
@JsonProperty("random") Bytes32 random,
@JsonProperty("suggestedFeeRecipient") Bytes20 suggestedFeeRecipient) {
checkNotNull(timestamp, "timestamp");
checkNotNull(random, "random");
checkNotNull(suggestedFeeRecipient, "suggestedFeeRecipient");
this.timestamp = timestamp;
this.random = random;
this.suggestedFeeRecipient = suggestedFeeRecipient;
}

public static KilnV1PayloadAttributesV1 fromPayloadAttributesV1(
PayloadAttributesV1 payloadAttributes) {
return new KilnV1PayloadAttributesV1(
payloadAttributes.timestamp,
payloadAttributes.prevRandao,
payloadAttributes.suggestedFeeRecipient);
}

@Override
public boolean equals(final Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final KilnV1PayloadAttributesV1 that = (KilnV1PayloadAttributesV1) o;
return Objects.equals(timestamp, that.timestamp)
&& Objects.equals(random, that.random)
&& Objects.equals(suggestedFeeRecipient, that.suggestedFeeRecipient);
}

@Override
public int hashCode() {
return Objects.hash(timestamp, random, suggestedFeeRecipient);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("timestamp", timestamp)
.add("random", random)
.add("suggestedFeeRecipient", suggestedFeeRecipient)
.toString();
}
}

static class KilnV1GetPayloadWeb3jResponse
extends org.web3j.protocol.core.Response<KilnV1ExecutionPayloadV1> {}
}
Loading

0 comments on commit ea3db51

Please sign in to comment.