debug and fix block build

Author: g11tech

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,
@@ -43,7 +44,6 @@ import type {
   Withdrawal,
   WithdrawalRequest,
 } from '@ethereumjs/util'
-import { genTransactionsSszRoot, genWithdrawalsSszRoot } from '../helpers.js'
 
 /**
  * Class representing a block in the Ethereum network. The {@link BlockHeader} has its own
@@ -227,7 +227,9 @@ export class Block {
    * Generates transaction trie for validation.
    */
   async genTxTrie(): Promise<Uint8Array> {
-    return this.common.isActivatedEIP(6493)? genTransactionsSszRoot(this.transactions): genTransactionsTrieRoot(this.transactions, new Trie({ common: this.common }))
+    return this.common.isActivatedEIP(6493)
+      ? genTransactionsSszRoot(this.transactions)
+      : genTransactionsTrieRoot(this.transactions, new Trie({ common: this.common }))
   }
 
   /**
@@ -360,7 +362,7 @@ export class Block {
 
     if (!(await this.transactionsTrieIsValid())) {
       const msg = this._errorMsg(
-        `invalid transaction trie expected=${bytesToHex(this.cache.txTrieRoot!)}`
+        `invalid transaction trie expected=${bytesToHex(this.cache.txTrieRoot!)}`,
       )
       throw new Error(msg)
     }
@@ -451,7 +453,9 @@ export class Block {
   }
 
   async genWithdrawalsTrie(): Promise<Uint8Array> {
-    return this.common.isActivatedEIP(6493)? genWithdrawalsSszRoot(this.withdrawals!): genWithdrawalsTrieRoot(this.withdrawals!, new Trie({ common: this.common }))
+    return this.common.isActivatedEIP(6493)
+      ? genWithdrawalsSszRoot(this.withdrawals!)
+      : genWithdrawalsTrieRoot(this.withdrawals!, new Trie({ common: this.common }))
   }
 
   /**
@@ -535,7 +539,9 @@ export class Block {
   toExecutionPayload(): ExecutionPayload {
     const blockJSON = this.toJSON()
     const header = blockJSON.header!
-    const transactions = this.common.isActivatedEIP(6493)? this.transactions.map((tx) => tx.toExecutionPayloadTx()) : 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 = {

packages/block/src/block/constructors.ts

@@ -2,9 +2,10 @@ import { RLP } from '@ethereumjs/rlp'
 import { Trie } from '@ethereumjs/trie'
 import {
   type TxOptions,
+  createTx,
   createTxFromBlockBodyData,
-  createTxFromSerializedData,
-  createTxFromTxData,
+  createTxFromExecutionPayloadTx,
+  createTxFromRLP,
   normalizeTxParams,
 } from '@ethereumjs/tx'
 import {
@@ -25,7 +26,13 @@ import {
 } from '@ethereumjs/util'
 
 import { generateCliqueBlockExtraData } from '../consensus/clique.js'
-import { genRequestsTrieRoot, genTransactionsSszRoot, genTransactionsTrieRoot, genWithdrawalsSszRoot, 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,
@@ -55,7 +63,6 @@ import type {
   RequestBytes,
   WithdrawalBytes,
 } from '@ethereumjs/util'
-import type { Common } from '@ethereumjs/common'
 
 /**
  * Static constructor to create a block from a block data dictionary
@@ -78,7 +85,7 @@ export function createBlock(blockData: BlockData = {}, opts?: BlockOptions) {
   // parse transactions
   const transactions = []
   for (const txData of txsData ?? []) {
-    const tx = createTxFromTxData(txData, {
+    const tx = createTx(txData, {
       ...opts,
       // Use header common in case of setHardfork being activated
       common: header.common,
@@ -289,7 +296,7 @@ export function createBlockFromRPC(
   const opts = { common: header.common }
   for (const _txParams of blockParams.transactions ?? []) {
     const txParams = normalizeTxParams(_txParams)
-    const tx = createTxFromTxData(txParams, opts)
+    const tx = createTx(txParams, opts)
     transactions.push(tx)
   }
 
@@ -374,7 +381,7 @@ export const createBlockFromJSONRPCProvider = async (
  */
 export async function createBlockFromExecutionPayload(
   payload: ExecutionPayload,
-  opts: BlockOptions & {common: Common},
+  opts: BlockOptions & { common: Common },
 ): Promise<Block> {
   const {
     blockNumber: number,
@@ -392,19 +399,19 @@ export async function createBlockFromExecutionPayload(
   const txs = []
   for (const [index, serializedTxOrPayload] of transactions.entries()) {
     try {
-      let tx;
+      let tx
       if (opts.common.isActivatedEIP(6493)) {
         if (typeof serializedTxOrPayload === 'string') {
           throw Error('EIP 6493 activated for transaction bytes')
         }
-        tx = createTxFromExecutionPayloadTx(hexToBytes(serializedTxOrPayload), {
+        tx = createTxFromExecutionPayloadTx(serializedTxOrPayload, {
           common: opts?.common,
         })
-      }else{
+      } else {
         if (typeof serializedTxOrPayload !== 'string') {
           throw Error('EIP 6493 not activated for transaction payload')
         }
-        tx = createTxFromSerializedData(hexToBytes(serializedTxOrPayload as PrefixedHexString), {
+        tx = createTxFromRLP(hexToBytes(serializedTxOrPayload as PrefixedHexString), {
           common: opts?.common,
         })
       }
@@ -415,10 +422,14 @@ export async function createBlockFromExecutionPayload(
     }
   }
 
-  const transactionsTrie = opts.common.isActivatedEIP(6493)? await genTransactionsSszRoot(txs) : await genTransactionsTrieRoot(txs, new Trie({ common: opts?.common }))
+  const transactionsTrie = opts.common.isActivatedEIP(6493)
+    ? await genTransactionsSszRoot(txs)
+    : await genTransactionsTrieRoot(txs, new Trie({ common: opts?.common }))
   const withdrawals = withdrawalsData?.map((wData) => createWithdrawal(wData))
   const withdrawalsRoot = withdrawals
-    ? opts.common.isActivatedEIP(6493)? genWithdrawalsSszRoot(withdrawals) : await genWithdrawalsTrieRoot(withdrawals, new Trie({ common: opts?.common }))
+    ? opts.common.isActivatedEIP(6493)
+      ? genWithdrawalsSszRoot(withdrawals)
+      : await genWithdrawalsTrieRoot(withdrawals, new Trie({ common: opts?.common }))
     : undefined
 
   const hasDepositRequests = depositRequests !== undefined && depositRequests !== null

packages/block/src/from-beacon-payload.ts

@@ -1,7 +1,12 @@
 import { bigIntToHex } from '@ethereumjs/util'
 
 import type { ExecutionPayload } from './types.js'
-import type { NumericString, PrefixedHexString, VerkleExecutionWitness, ssz } from '@ethereumjs/util'
+import type {
+  NumericString,
+  PrefixedHexString,
+  VerkleExecutionWitness,
+  ssz,
+} from '@ethereumjs/util'
 
 type BeaconWithdrawal = {
   index: PrefixedHexString

packages/block/src/helpers.ts

@@ -1,13 +1,14 @@
 import { RLP } from '@ethereumjs/rlp'
 import { Trie } from '@ethereumjs/trie'
 import { Blob4844Tx } from '@ethereumjs/tx'
-import { BIGINT_0, BIGINT_1, TypeOutput, isHexString, toType } from '@ethereumjs/util'
+import { BIGINT_0, BIGINT_1, TypeOutput, isHexString, ssz, toType } from '@ethereumjs/util'
 
 import type { BlockHeaderBytes, HeaderData } from './types.js'
+import type { ValueOf } from '@chainsafe/ssz'
 import type { TypedTransaction } from '@ethereumjs/tx'
-import type { CLRequest, CLRequestType, PrefixedHexString, Withdrawal, ssz } from '@ethereumjs/util'
+import type { CLRequest, CLRequestType, PrefixedHexString, Withdrawal } from '@ethereumjs/util'
 
-export type SszTransactionType = ValueOf<typeof ssz.Transaction>
+export type SSZTransactionType = ValueOf<typeof ssz.Transaction>
 
 /**
  * Returns a 0x-prefixed hex number string from a hex string or string integer.
@@ -134,7 +135,7 @@ export async function genWithdrawalsTrieRoot(wts: Withdrawal[], emptyTrie?: Trie
   return trie.root()
 }
 
-export async function genWithdrawalsSszRoot(wts: Withdrawal[]) {
+export function genWithdrawalsSszRoot(wts: Withdrawal[]) {
   const withdrawals = wts.map((wt) => wt.toValue())
   return ssz.Withdrawals.hashTreeRoot(withdrawals)
 }
@@ -153,7 +154,7 @@ export async function genTransactionsTrieRoot(txs: TypedTransaction[], emptyTrie
 }
 
 export async function genTransactionsSszRoot(txs: TypedTransaction[]) {
-  const transactions = txs.map((tx) => tx.sszRaw() as unknown as SszTransactionType)
+  const transactions = txs.map((tx) => tx.sszRaw() as unknown as SSZTransactionType)
   return ssz.Transactions.hashTreeRoot(transactions)
 }
 

packages/tx/src/index.ts

@@ -11,6 +11,7 @@ export * from './params.js'
 export {
   createTx,
   createTxFromBlockBodyData,
+  createTxFromExecutionPayloadTx,
   createTxFromJSONRPCProvider,
   createTxFromRLP,
   createTxFromRPC,