updates after discussion with etan

Author: g11tech

packages/block/src/header/header.ts

@@ -640,7 +640,6 @@ export class BlockHeader {
   sszRaw(): SSZHeaderType {
     const header = {
       parentHash: this.parentHash,
-      uncleHash: this.uncleHash,
       coinbase: this.coinbase.bytes,
       stateRoot: this.stateRoot,
       transactionsTrie: this.transactionsTrie,
@@ -659,7 +658,7 @@ export class BlockHeader {
         blob: this.common.isActivatedEIP(4844) ? this.getBlobGasPrice() : null,
       },
       withdrawalsRoot: this.withdrawalsRoot ?? null,
-      excessBlobGas: this.excessBlobGas ?? null,
+      excessGas: {regular: null, blob: this.excessBlobGas ?? null},
       parentBeaconBlockRoot: this.parentBeaconBlockRoot ?? null,
       requestsRoot: this.requestsRoot ?? null,
     }

packages/util/src/ssz.ts

@@ -366,7 +366,6 @@ const MAX_EXTRA_DATA_BYTES = 32
 export const BlockHeader = new StableContainerType(
   {
     parentHash: new OptionalType(Bytes32),
-    uncleHash: new OptionalType(Bytes32),
     coinbase: new OptionalType(Bytes20),
     stateRoot: new OptionalType(Bytes32),
     transactionsTrie: new OptionalType(Bytes32),
@@ -379,7 +378,7 @@ export const BlockHeader = new StableContainerType(
     mixHash: new OptionalType(Bytes32),
     baseFeePerGas: new OptionalType(FeesPerGas),
     withdrawalsRoot: new OptionalType(Bytes32),
-    excessBlobGas: new OptionalType(FeePerGas),
+    excessGas: new OptionalType(FeesPerGas),
     parentBeaconBlockRoot: new OptionalType(Bytes32),
     requestsRoot: new OptionalType(Bytes32),
   },