Move excess_data_gas to the end of Payload

data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionPayloadDeneb.json

@@ -1,7 +1,7 @@
 {
   "title" : "ExecutionPayloadDeneb",
   "type" : "object",
-  "required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "excess_data_gas", "block_hash", "transactions", "withdrawals" ],
+  "required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions", "withdrawals", "excess_data_gas" ],
   "properties" : {
     "parent_hash" : {
       "type" : "string",
@@ -75,12 +75,6 @@
       "example" : "1",
       "format" : "uint256"
     },
-    "excess_data_gas" : {
-      "type" : "string",
-      "description" : "unsigned 256 bit integer",
-      "example" : "1",
-      "format" : "uint256"
-    },
     "block_hash" : {
       "type" : "string",
       "description" : "Bytes32 hexadecimal",
@@ -101,6 +95,12 @@
       "items" : {
         "$ref" : "#/components/schemas/Withdrawal"
       }
+    },
+    "excess_data_gas" : {
+      "type" : "string",
+      "description" : "unsigned 256 bit integer",
+      "example" : "1",
+      "format" : "uint256"
     }
   }
 }

data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionPayloadHeaderDeneb.json

@@ -1,7 +1,7 @@
 {
   "title" : "ExecutionPayloadHeaderDeneb",
   "type" : "object",
-  "required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "excess_data_gas", "block_hash", "transactions_root", "withdrawals_root" ],
+  "required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions_root", "withdrawals_root", "excess_data_gas" ],
   "properties" : {
     "parent_hash" : {
       "type" : "string",
@@ -75,12 +75,6 @@
       "example" : "1",
       "format" : "uint256"
     },
-    "excess_data_gas" : {
-      "type" : "string",
-      "description" : "unsigned 256 bit integer",
-      "example" : "1",
-      "format" : "uint256"
-    },
     "block_hash" : {
       "type" : "string",
       "description" : "Bytes32 hexadecimal",
@@ -98,6 +92,12 @@
       "description" : "Bytes32 hexadecimal",
       "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
       "format" : "byte"
+    },
+    "excess_data_gas" : {
+      "type" : "string",
+      "description" : "unsigned 256 bit integer",
+      "example" : "1",
+      "format" : "uint256"
     }
   }
 }

data/serializer/src/main/java/tech/pegasys/teku/api/schema/deneb/ExecutionPayloadDeneb.java

@@ -49,10 +49,10 @@ public ExecutionPayloadDeneb(
       @JsonProperty("timestamp") final UInt64 timestamp,
       @JsonProperty("extra_data") final Bytes extraData,
       @JsonProperty("base_fee_per_gas") final UInt256 baseFeePerGas,
-      @JsonProperty("excess_data_gas") final UInt256 excessDataGas,
       @JsonProperty("block_hash") final Bytes32 blockHash,
       @JsonProperty("transactions") final List<Bytes> transactions,
-      @JsonProperty("withdrawals") final List<Withdrawal> withdrawals) {
+      @JsonProperty("withdrawals") final List<Withdrawal> withdrawals,
+      @JsonProperty("excess_data_gas") final UInt256 excessDataGas) {
     super(
         parentHash,
         feeRecipient,
@@ -125,10 +125,10 @@ public String toString() {
         .add("timestamp", timestamp)
         .add("extraData", extraData)
         .add("baseFeePerGas", baseFeePerGas)
-        .add("excessDataGas", excessDataGas)
         .add("blockHash", blockHash)
         .add("transactions", transactions)
         .add("withdrawals", withdrawals)
+        .add("excessDataGas", excessDataGas)
         .toString();
   }
 }

data/serializer/src/main/java/tech/pegasys/teku/api/schema/deneb/ExecutionPayloadHeaderDeneb.java

@@ -46,10 +46,10 @@ public ExecutionPayloadHeaderDeneb(
       @JsonProperty("timestamp") final UInt64 timestamp,
       @JsonProperty("extra_data") final Bytes extraData,
       @JsonProperty("base_fee_per_gas") final UInt256 baseFeePerGas,
-      @JsonProperty("excess_data_gas") final UInt256 excessDataGas,
       @JsonProperty("block_hash") final Bytes32 blockHash,
       @JsonProperty("transactions_root") final Bytes32 transactionsRoot,
-      @JsonProperty("withdrawals_root") final Bytes32 withdrawalsRoot) {
+      @JsonProperty("withdrawals_root") final Bytes32 withdrawalsRoot,
+      @JsonProperty("excess_data_gas") final UInt256 excessDataGas) {
     super(
         parentHash,
         feeRecipient,
@@ -153,10 +153,10 @@ public String toString() {
         .add("timestamp", timestamp)
         .add("extraData", extraData)
         .add("baseFeePerGas", baseFeePerGas)
-        .add("excessDataGas", excessDataGas)
         .add("blockHash", blockHash)
         .add("transactionsRoot", transactionsRoot)
         .add("withdrawalsRoot", withdrawalsRoot)
+        .add("excessDataGas", excessDataGas)
         .toString();
   }
 }

ethereum/executionclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV3.java

@@ -51,10 +51,10 @@ public ExecutionPayloadV3(
       @JsonProperty("timestamp") UInt64 timestamp,
       @JsonProperty("extraData") Bytes extraData,
       @JsonProperty("baseFeePerGas") UInt256 baseFeePerGas,
-      @JsonProperty("excessDataGas") UInt256 excessDataGas,
       @JsonProperty("blockHash") Bytes32 blockHash,
       @JsonProperty("transactions") List<Bytes> transactions,
-      @JsonProperty("withdrawals") List<WithdrawalV1> withdrawals) {
+      @JsonProperty("withdrawals") List<WithdrawalV1> withdrawals,
+      @JsonProperty("excessDataGas") UInt256 excessDataGas) {
     super(
         parentHash,
         feeRecipient,
@@ -91,12 +91,15 @@ public static ExecutionPayloadV3 fromInternalExecutionPayload(
         executionPayload.getTimestamp(),
         executionPayload.getExtraData(),
         executionPayload.getBaseFeePerGas(),
-        executionPayload.toVersionDeneb().map(ExecutionPayloadDeneb::getExcessDataGas).orElse(null),
         executionPayload.getBlockHash(),
         executionPayload.getTransactions().stream()
             .map(SszByteListImpl::getBytes)
             .collect(Collectors.toList()),
-        withdrawalsList);
+        withdrawalsList,
+        executionPayload
+            .toVersionDeneb()
+            .map(ExecutionPayloadDeneb::getExcessDataGas)
+            .orElse(null));
   }
 
   @Override

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/ExecutionPayloadFields.java

@@ -29,12 +29,12 @@ public enum ExecutionPayloadFields implements SszFieldName {
   TIMESTAMP,
   EXTRA_DATA,
   BASE_FEE_PER_GAS,
-  EXCESS_DATA_GAS,
   BLOCK_HASH,
   TRANSACTIONS,
   WITHDRAWALS,
   TRANSACTIONS_ROOT,
-  WITHDRAWALS_ROOT;
+  WITHDRAWALS_ROOT,
+  EXCESS_DATA_GAS;
 
   private final String sszFieldName;
 

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/deneb/ExecutionPayloadBuilderDeneb.java

@@ -68,11 +68,11 @@ public ExecutionPayload build() {
         SszUInt64.of(timestamp),
         schema.getExtraDataSchema().fromBytes(extraData),
         SszUInt256.of(baseFeePerGas),
-        SszUInt256.of(excessDataGas),
         SszBytes32.of(blockHash),
         transactions.stream()
             .map(schema.getTransactionSchema()::fromBytes)
             .collect(schema.getTransactionsSchema().collector()),
-        schema.getWithdrawalsSchema().createFromElements(withdrawals));
+        schema.getWithdrawalsSchema().createFromElements(withdrawals),
+        SszUInt256.of(excessDataGas));
   }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/deneb/ExecutionPayloadDenebImpl.java

@@ -47,10 +47,10 @@ public class ExecutionPayloadDenebImpl
         SszUInt64,
         SszByteList,
         SszUInt256,
-        SszUInt256,
         SszBytes32,
         SszList<Transaction>,
-        SszList<Withdrawal>>
+        SszList<Withdrawal>,
+        SszUInt256>
     implements ExecutionPayloadDeneb {
 
   public ExecutionPayloadDenebImpl(
@@ -68,10 +68,10 @@ public ExecutionPayloadDenebImpl(
               SszUInt64,
               SszByteList,
               SszUInt256,
-              SszUInt256,
               SszBytes32,
               SszList<Transaction>,
-              SszList<Withdrawal>>
+              SszList<Withdrawal>,
+              SszUInt256>
           schema,
       TreeNode backingNode) {
     super(schema, backingNode);
@@ -91,10 +91,10 @@ public ExecutionPayloadDenebImpl(
       SszUInt64 timestamp,
       SszByteList extraData,
       SszUInt256 baseFeePerGas,
-      SszUInt256 excessDataGas,
       SszBytes32 blockHash,
       SszList<Transaction> transactions,
-      SszList<Withdrawal> withdrawals) {
+      SszList<Withdrawal> withdrawals,
+      SszUInt256 excessDataGas) {
     super(
         schema,
         parentHash,
@@ -109,10 +109,10 @@ public ExecutionPayloadDenebImpl(
         timestamp,
         extraData,
         baseFeePerGas,
-        excessDataGas,
         blockHash,
         transactions,
-        withdrawals);
+        withdrawals,
+        excessDataGas);
   }
 
   @Override
@@ -190,14 +190,9 @@ public UInt256 getBaseFeePerGas() {
     return getField11().get();
   }
 
-  @Override
-  public UInt256 getExcessDataGas() {
-    return getField12().get();
-  }
-
   @Override
   public Bytes32 getBlockHash() {
-    return getField13().get();
+    return getField12().get();
   }
 
   @Override
@@ -207,12 +202,17 @@ public Bytes32 getPayloadHash() {
 
   @Override
   public SszList<Transaction> getTransactions() {
-    return getField14();
+    return getField13();
   }
 
   @Override
   public SszList<Withdrawal> getWithdrawals() {
-    return getField15();
+    return getField14();
+  }
+
+  @Override
+  public UInt256 getExcessDataGas() {
+    return getField15().get();
   }
 
   @Override

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/deneb/ExecutionPayloadHeaderBuilderDeneb.java

@@ -69,9 +69,9 @@ public ExecutionPayloadHeader build() {
         SszUInt64.of(timestamp),
         schema.getExtraDataSchema().fromBytes(extraData),
         SszUInt256.of(baseFeePerGas),
-        SszUInt256.of(excessDataGas),
         SszBytes32.of(blockHash),
         SszBytes32.of(transactionsRoot),
-        SszBytes32.of(withdrawalsRoot));
+        SszBytes32.of(withdrawalsRoot),
+        SszUInt256.of(excessDataGas));
   }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/deneb/ExecutionPayloadHeaderDenebImpl.java

@@ -42,10 +42,10 @@ public class ExecutionPayloadHeaderDenebImpl
         SszUInt64,
         SszByteList,
         SszUInt256,
-        SszUInt256,
         SszBytes32,
         SszBytes32,
-        SszBytes32>
+        SszBytes32,
+        SszUInt256>
     implements ExecutionPayloadHeaderDeneb {
 
   protected ExecutionPayloadHeaderDenebImpl(
@@ -63,10 +63,10 @@ protected ExecutionPayloadHeaderDenebImpl(
               SszUInt64,
               SszByteList,
               SszUInt256,
-              SszUInt256,
               SszBytes32,
               SszBytes32,
-              SszBytes32>
+              SszBytes32,
+              SszUInt256>
           schema,
       TreeNode backingTree) {
     super(schema, backingTree);
@@ -86,10 +86,10 @@ public ExecutionPayloadHeaderDenebImpl(
       SszUInt64 timestamp,
       SszByteList extraData,
       SszUInt256 baseFeePerGas,
-      SszUInt256 excessDataGas,
       SszBytes32 blockHash,
       SszBytes32 transactionsRoot,
-      SszBytes32 withdrawalsRoot) {
+      SszBytes32 withdrawalsRoot,
+      SszUInt256 excessDataGas) {
     super(
         schema,
         parentHash,
@@ -104,10 +104,10 @@ public ExecutionPayloadHeaderDenebImpl(
         timestamp,
         extraData,
         baseFeePerGas,
-        excessDataGas,
         blockHash,
         transactionsRoot,
-        withdrawalsRoot);
+        withdrawalsRoot,
+        excessDataGas);
   }
 
   @Override
@@ -185,19 +185,14 @@ public UInt256 getBaseFeePerGas() {
     return getField11().get();
   }
 
-  @Override
-  public UInt256 getExcessDataGas() {
-    return getField12().get();
-  }
-
   @Override
   public Bytes32 getBlockHash() {
-    return getField13().get();
+    return getField12().get();
   }
 
   @Override
   public Bytes32 getTransactionsRoot() {
-    return getField14().get();
+    return getField13().get();
   }
 
   @Override
@@ -207,6 +202,11 @@ public Bytes32 getPayloadHash() {
 
   @Override
   public Bytes32 getWithdrawalsRoot() {
+    return getField14().get();
+  }
+
+  @Override
+  public UInt256 getExcessDataGas() {
     return getField15().get();
   }
 }