Merge branch 'main' into EIP4788

pinges · Aug 22, 2023 · 464afde · 464afde
2 parents 8c134c5 + c3c7205
commit 464afde
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java b/.../org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java
@@ -27,11 +27,12 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import org.apache.tuweni.bytes.Bytes32;
 
-@JsonPropertyOrder({"executionPayload", "blockValue", "blobsBundle"})
+@JsonPropertyOrder({"executionPayload", "blockValue", "blobsBundle", "shouldOverrideBuilder"})
 public class EngineGetPayloadResultV3 {
   protected final PayloadResult executionPayload;
   private final String blockValue;
   private final BlobsBundleV1 blobsBundle;
+  private final boolean shouldOverrideBuilder;
 
   public EngineGetPayloadResultV3(
       final BlockHeader header,
@@ -42,6 +43,7 @@ public EngineGetPayloadResultV3(
     this.executionPayload = new PayloadResult(header, transactions, withdrawals);
     this.blockValue = blockValue;
     this.blobsBundle = blobsBundle;
+    this.shouldOverrideBuilder = false;
   }
 
   @JsonGetter(value = "executionPayload")
@@ -59,6 +61,11 @@ public BlobsBundleV1 getBlobsBundle() {
     return blobsBundle;
   }
 
+  @JsonGetter(value = "shouldOverrideBuilder")
+  public boolean shouldOverrideBuilder() {
+    return shouldOverrideBuilder;
+  }
+
   public static class PayloadResult {
 
     protected final String blockHash;