add ssz blockheader type and update the blockhash to use when ssz activated

Author: g11tech

packages/block/src/header/header.ts

@@ -16,6 +16,7 @@ import {
   createZeroAddress,
   equalsBytes,
   hexToBytes,
+  ssz,
   toType,
   zeros,
 } from '@ethereumjs/util'
@@ -30,6 +31,9 @@ import { fakeExponential } from '../helpers.js'
 import { paramsBlock } from '../params.js'
 
 import type { BlockHeaderBytes, BlockOptions, HeaderData, JSONHeader } from '../types.js'
+import type { ValueOf } from '@chainsafe/ssz'
+
+export type SSZHeaderType = ValueOf<typeof ssz.BlockHeader>
 
 interface HeaderCache {
   hash: Uint8Array | undefined
@@ -633,17 +637,55 @@ export class BlockHeader {
     return rawItems
   }
 
+  sszRaw(): SSZHeaderType {
+    const header = {
+      parentHash: this.parentHash,
+      uncleHash: this.uncleHash,
+      coinbase: this.coinbase.bytes,
+      stateRoot: this.stateRoot,
+      transactionsTrie: this.transactionsTrie,
+      receiptTrie: this.receiptTrie,
+      number: this.number,
+      gasLimits: {
+        regular: this.gasLimit,
+        blob: this.common.isActivatedEIP(4844) ? this.common.param('maxblobGasPerBlock') : null,
+      },
+      gasUsed: { regular: this.gasUsed, blob: this.blobGasUsed ?? null },
+      timestamp: this.timestamp,
+      extraData: this.extraData,
+      mixHash: this.mixHash,
+      baseFeePerGas: {
+        regular: this.baseFeePerGas ?? null,
+        blob: this.common.isActivatedEIP(4844) ? this.getBlobGasPrice() : null,
+      },
+      withdrawalsRoot: this.withdrawalsRoot ?? null,
+      excessBlobGas: this.excessBlobGas ?? null,
+      parentBeaconBlockRoot: this.parentBeaconBlockRoot ?? null,
+      requestsRoot: this.requestsRoot ?? null,
+    }
+
+    return header
+  }
+
+  calcHash(): Uint8Array {
+    if (this.common.isActivatedEIP(6493)) {
+      return ssz.BlockHeader.hashTreeRoot(this.sszRaw())
+    } else {
+      return this.keccakFunction(RLP.encode(this.raw()))
+    }
+  }
+
   /**
    * Returns the hash of the block header.
    */
   hash(): Uint8Array {
     if (Object.isFrozen(this)) {
       if (!this.cache.hash) {
-        this.cache.hash = this.keccakFunction(RLP.encode(this.raw())) as Uint8Array
+        this.cache.hash = this.calcHash()
       }
       return this.cache.hash
     }
-    return this.keccakFunction(RLP.encode(this.raw()))
+    return this.calcHash()
   }
 
   /**

packages/block/src/index.ts

@@ -5,10 +5,10 @@ export { type BeaconPayloadJSON, executionPayloadFromBeaconPayload } from './fro
 export * from './header/index.js'
 export {
   genRequestsTrieRoot,
-  genTransactionsTrieRoot,
   genTransactionsSszRoot,
-  genWithdrawalsTrieRoot,
+  genTransactionsTrieRoot,
   genWithdrawalsSszRoot,
+  genWithdrawalsTrieRoot,
   getDifficulty,
   valuesArrayToHeaderData,
 } from './helpers.js'

packages/util/src/ssz.ts

@@ -31,6 +31,7 @@ export const Uint256 = new UintBigintType(32)
 
 export const Bytes20 = new ByteVectorType(20)
 export const Bytes32 = new ByteVectorType(32)
+export const Bytes256 = new ByteVectorType(256)
 
 export const FeePerGas = Uint256
 export const ChainId = Uint64
@@ -358,3 +359,30 @@ export type TransactionV1 = {
   payload: TransactionPayloadV1
   signature: TransactionSignatureV1
 }
+
+export const MAX_BLOCKHEADER_FIELDS = 64
+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),
+    receiptTrie: new OptionalType(Bytes32),
+    number: new OptionalType(Uint64),
+    gasLimits: new OptionalType(FeesPerGas),
+    gasUsed: new OptionalType(FeesPerGas),
+    timestamp: new OptionalType(Uint64),
+    extraData: new OptionalType(new ByteListType(MAX_EXTRA_DATA_BYTES)),
+    mixHash: new OptionalType(Bytes32),
+    baseFeePerGas: new OptionalType(FeesPerGas),
+    withdrawalsRoot: new OptionalType(Bytes32),
+    excessBlobGas: new OptionalType(FeePerGas),
+    parentBeaconBlockRoot: new OptionalType(Bytes32),
+    requestsRoot: new OptionalType(Bytes32),
+  },
+  MAX_BLOCKHEADER_FIELDS,
+  { typeName: 'BlockHeader', jsonCase: 'eth2' },
+)