fusaka light client: implement Ssz and Log EIPs to enable merkle proof generation and validation

packages/block/package.json

@@ -47,6 +47,7 @@
     "tsc": "../../config/cli/ts-compile.sh"
   },
   "dependencies": {
+    "@chainsafe/ssz": "^0.18.0",
     "@ethereumjs/common": "^4.4.0",
     "@ethereumjs/rlp": "^5.0.2",
     "@ethereumjs/mpt": "^6.2.2",

packages/block/src/block/block.ts

@@ -18,6 +18,7 @@ import { keccak256 } from 'ethereum-cryptography/keccak.js'
 // TODO: See if there is an easier way to achieve the same result.
 // See: https://github.com/microsoft/TypeScript/issues/47558
 // (situation will eventually improve on Typescript and/or Eslint update)
+import { genTransactionsSszRoot, genWithdrawalsSszRoot } from '../helpers.js'
 import {
   genRequestsTrieRoot,
   genTransactionsTrieRoot,
@@ -226,10 +227,9 @@ export class Block {
    * Generates transaction trie for validation.
    */
   async genTxTrie(): Promise<Uint8Array> {
-    return genTransactionsTrieRoot(
-      this.transactions,
-      new MerklePatriciaTrie({ common: this.common }),
-    )
+    return this.common.isActivatedEIP(6493)
+      ? genTransactionsSszRoot(this.transactions)
+      : genTransactionsTrieRoot(this.transactions, new MerklePatriciaTrie({ common: this.common }))
   }
 
   /**
@@ -238,16 +238,10 @@ export class Block {
    * @returns True if the transaction trie is valid, false otherwise
    */
   async transactionsTrieIsValid(): Promise<boolean> {
-    let result
-    if (this.transactions.length === 0) {
-      result = equalsBytes(this.header.transactionsTrie, KECCAK256_RLP)
-      return result
-    }
-
     if (this.cache.txTrieRoot === undefined) {
       this.cache.txTrieRoot = await this.genTxTrie()
     }
-    result = equalsBytes(this.cache.txTrieRoot, this.header.transactionsTrie)
+    const result = equalsBytes(this.cache.txTrieRoot, this.header.transactionsTrie)
     return result
   }
 
@@ -367,7 +361,9 @@ export class Block {
     }
 
     if (!(await this.transactionsTrieIsValid())) {
-      const msg = this._errorMsg('invalid transaction trie')
+      const msg = this._errorMsg(
+        `invalid transaction trie expected=${bytesToHex(this.cache.txTrieRoot!)}`,
+      )
       throw new Error(msg)
     }
 
@@ -456,6 +452,12 @@ export class Block {
     return equalsBytes(this.keccakFunction(raw), this.header.uncleHash)
   }
 
+  async genWithdrawalsTrie(): Promise<Uint8Array> {
+    return this.common.isActivatedEIP(6493)
+      ? genWithdrawalsSszRoot(this.withdrawals!)
+      : genWithdrawalsTrieRoot(this.withdrawals!, new MerklePatriciaTrie({ common: this.common }))
+  }
+
   /**
    * Validates the withdrawal root
    * @returns true if the withdrawals trie root is valid, false otherwise
@@ -465,19 +467,10 @@ export class Block {
       throw new Error('EIP 4895 is not activated')
     }
 
-    let result
-    if (this.withdrawals!.length === 0) {
-      result = equalsBytes(this.header.withdrawalsRoot!, KECCAK256_RLP)
-      return result
-    }
-
     if (this.cache.withdrawalsTrieRoot === undefined) {
-      this.cache.withdrawalsTrieRoot = await genWithdrawalsTrieRoot(
-        this.withdrawals!,
-        new MerklePatriciaTrie({ common: this.common }),
-      )
+      this.cache.withdrawalsTrieRoot = await this.genWithdrawalsTrie()
     }
-    result = equalsBytes(this.cache.withdrawalsTrieRoot, this.header.withdrawalsRoot!)
+    const result = equalsBytes(this.cache.withdrawalsTrieRoot, this.header.withdrawalsRoot!)
     return result
   }
 
@@ -546,7 +539,9 @@ export class Block {
   toExecutionPayload(): ExecutionPayload {
     const blockJSON = this.toJSON()
     const header = blockJSON.header!
-    const transactions = this.transactions.map((tx) => bytesToHex(tx.serialize())) ?? []
+    const transactions = this.common.isActivatedEIP(6493)
+      ? this.transactions.map((tx) => tx.toExecutionPayloadTx())
+      : this.transactions.map((tx) => bytesToHex(tx.serialize()))
     const withdrawalsArr = blockJSON.withdrawals ? { withdrawals: blockJSON.withdrawals } : {}
 
     const executionPayload: ExecutionPayload = {
@@ -574,6 +569,7 @@ export class Block {
       depositRequests: this.common.isActivatedEIP(6110) ? [] : undefined,
       withdrawalRequests: this.common.isActivatedEIP(7002) ? [] : undefined,
       consolidationRequests: this.common.isActivatedEIP(7251) ? [] : undefined,
+      systemLogsRoot: this.common.isActivatedEIP(6493) ? header.systemLogsRoot : undefined,
     }
 
     if (this.requests !== undefined) {

packages/block/src/block/constructors.ts

@@ -4,6 +4,7 @@ import {
   type TxOptions,
   createTx,
   createTxFromBlockBodyData,
+  createTxFromExecutionPayloadTx,
   createTxFromRLP,
   normalizeTxParams,
 } from '@ethereumjs/tx'
@@ -25,7 +26,13 @@ import {
 } from '@ethereumjs/util'
 
 import { generateCliqueBlockExtraData } from '../consensus/clique.js'
-import { genRequestsTrieRoot, genTransactionsTrieRoot, genWithdrawalsTrieRoot } from '../helpers.js'
+import {
+  genRequestsTrieRoot,
+  genTransactionsSszRoot,
+  genTransactionsTrieRoot,
+  genWithdrawalsSszRoot,
+  genWithdrawalsTrieRoot,
+} from '../helpers.js'
 import {
   Block,
   createBlockHeader,
@@ -46,6 +53,7 @@ import type {
   RequestsBytes,
   WithdrawalsBytes,
 } from '../types.js'
+import type { Common } from '@ethereumjs/common'
 import type { TypedTransaction } from '@ethereumjs/tx'
 import type {
   CLRequest,
@@ -373,7 +381,7 @@ export const createBlockFromJSONRPCProvider = async (
  */
 export async function createBlockFromExecutionPayload(
   payload: ExecutionPayload,
-  opts?: BlockOptions,
+  opts: BlockOptions & { common: Common },
 ): Promise<Block> {
   const {
     blockNumber: number,
@@ -389,25 +397,39 @@ export async function createBlockFromExecutionPayload(
   } = payload
 
   const txs = []
-  for (const [index, serializedTx] of transactions.entries()) {
+  for (const [index, serializedTxOrPayload] of transactions.entries()) {
     try {
-      const tx = createTxFromRLP(hexToBytes(serializedTx as PrefixedHexString), {
-        common: opts?.common,
-      })
+      let tx
+      if (opts.common.isActivatedEIP(6493)) {
+        if (typeof serializedTxOrPayload === 'string') {
+          throw Error('EIP 6493 activated for transaction bytes')
+        }
+        tx = createTxFromExecutionPayloadTx(serializedTxOrPayload, {
+          common: opts?.common,
+        })
+      } else {
+        if (typeof serializedTxOrPayload !== 'string') {
+          throw Error('EIP 6493 not activated for transaction payload')
+        }
+        tx = createTxFromRLP(hexToBytes(serializedTxOrPayload as PrefixedHexString), {
+          common: opts?.common,
+        })
+      }
       txs.push(tx)
     } catch (error) {
       const validationError = `Invalid tx at index ${index}: ${error}`
       throw validationError
     }
   }
 
-  const transactionsTrie = await genTransactionsTrieRoot(
-    txs,
-    new MerklePatriciaTrie({ common: opts?.common }),
-  )
+  const transactionsTrie = opts.common.isActivatedEIP(6493)
+    ? await genTransactionsSszRoot(txs)
+    : await genTransactionsTrieRoot(txs, new MerklePatriciaTrie({ common: opts?.common }))
   const withdrawals = withdrawalsData?.map((wData) => createWithdrawal(wData))
   const withdrawalsRoot = withdrawals
-    ? await genWithdrawalsTrieRoot(withdrawals, new MerklePatriciaTrie({ common: opts?.common }))
+    ? opts.common.isActivatedEIP(6493)
+      ? genWithdrawalsSszRoot(withdrawals)
+      : await genWithdrawalsTrieRoot(withdrawals, new MerklePatriciaTrie({ common: opts?.common }))
     : undefined
 
   const hasDepositRequests = depositRequests !== undefined && depositRequests !== null
@@ -481,7 +503,7 @@ export async function createBlockFromExecutionPayload(
  */
 export async function createBlockFromBeaconPayloadJSON(
   payload: BeaconPayloadJSON,
-  opts?: BlockOptions,
+  opts: BlockOptions & { common: Common },
 ): Promise<Block> {
   const executionPayload = executionPayloadFromBeaconPayload(payload)
   return createBlockFromExecutionPayload(executionPayload, opts)