continuing work

packages/block/src/block.ts

@@ -1,9 +1,9 @@
 import { BaseTrie as Trie } from 'merkle-patricia-tree'
-import { BN, rlp, keccak256, KECCAK256_RLP, baToJSON } from 'ethereumjs-util'
+import { BN, rlp, keccak256, KECCAK256_RLP } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
 import { Transaction, TxOptions } from '@ethereumjs/tx'
 import { BlockHeader } from './header'
-import { Blockchain, BlockData, BlockOptions } from './types'
+import { BlockData, BlockOptions, JsonBlock, Blockchain } from './types'
 
 /**
  * An object that represents the block
@@ -86,11 +86,15 @@ export class Block {
    * This constructor takes the values, validates them, assigns them and freezes the object.
    * Use the static factory methods to assist in creating a Block object from varying data types and options.
    */
-  constructor(header: BlockHeader, transactions: Transaction[], uncleHeaders: BlockHeader[]) {
-    this.header = header
+  constructor(
+    header?: BlockHeader,
+    transactions: Transaction[] = [],
+    uncleHeaders: BlockHeader[] = [],
+    opts: BlockOptions = {},
+  ) {
+    this.header = header || BlockHeader.fromHeaderData({}, opts)
     this.transactions = transactions
     this.uncleHeaders = uncleHeaders
-
     this._common = this.header._common
 
     Object.freeze(this)
@@ -231,11 +235,11 @@ export class Block {
   /**
    * Returns the block in JSON format.
    */
-  toJSON() {
+  toJSON(): JsonBlock {
     return {
       header: this.header.toJSON(),
       transactions: this.transactions.map((tx) => tx.toJSON()),
-      uncleHeaders: this.uncleHeaders.forEach((uh) => uh.toJSON()),
+      uncleHeaders: this.uncleHeaders.map((uh) => uh.toJSON()),
     }
   }
 

packages/block/src/header.ts

@@ -36,7 +36,7 @@ export class BlockHeader {
 
   public readonly _common: Common
 
-  public static fromHeaderData(headerData: HeaderData, opts: BlockOptions = {}) {
+  public static fromHeaderData(headerData: HeaderData = {}, opts: BlockOptions = {}) {
     const {
       parentHash,
       uncleHash,
@@ -132,6 +132,7 @@ export class BlockHeader {
    * This constructor takes the values, validates them, assigns them and freezes the object.
    * Use the public static factory methods to assist in creating a Header object from
    * varying data types.
+   * For a default empty header, use `BlockHeader.fromHeaderData()`.
    */
   constructor(
     parentHash: Buffer,
@@ -182,6 +183,7 @@ export class BlockHeader {
     if (options.hardforkByBlockNumber) {
       this._common.setHardforkByBlockNumber(this.number.toNumber())
     }
+
     if (options.initWithGenesisHeader) {
       if (this._common.hardfork() !== 'chainstart') {
         throw new Error(
@@ -231,7 +233,7 @@ export class BlockHeader {
     )
     let num = toBN(this.number)
 
-    // We use a ! here as TS can follow this hardforks-dependent logic, but it always gets assigned
+    // We use a ! here as TS cannot follow this hardfork-dependent logic, but it always gets assigned
     let dif!: BN
 
     if (this._common.hardforkGteHardfork(hardfork, 'byzantium')) {

packages/block/src/types.ts

@@ -1,5 +1,5 @@
 import Common from '@ethereumjs/common'
-import { TxData } from '@ethereumjs/tx'
+import { TxData, JsonTx } from '@ethereumjs/tx'
 import { Block } from './block'
 import { Address, BN } from 'ethereumjs-util'
 
@@ -96,9 +96,9 @@ export interface JsonBlock {
   /**
    * Header data for the block
    */
-  header?: string
-  transactions?: string
-  uncleHeaders?: string
+  header?: JsonHeader
+  transactions?: JsonTx[]
+  uncleHeaders?: JsonHeader[]
 }
 
 /**

packages/block/test/block.spec.ts

@@ -124,7 +124,6 @@ tape('[Block]: block functions', function (t) {
   t.test('should test toJSON', function (st) {
     const block = Block.fromRLPSerializedBlock(testData2.blocks[2].rlp)
     st.equal(typeof block.toJSON(), 'object')
-    st.equal(typeof block.toJSON(true), 'object')
     st.end()
   })
 

packages/blockchain/src/index.ts

@@ -347,12 +347,12 @@ export default class Blockchain implements BlockchainInterface {
    * @hidden
    */
   async _putBlockOrHeader(item: Block | BlockHeader, isGenesis?: boolean) {
-    const block = item instanceof BlockHeader ? new Block(item, [], []) : item
+    const block = item instanceof BlockHeader ? new Block(item) : item
 
     const header = block.header
     const hash = block.hash()
-    const number = new BN(header.number)
-    const td = new BN(header.difficulty)
+    const number = header.number
+    const td = header.difficulty
     const currentTd = { header: new BN(0), block: new BN(0) }
     const dbOps: DBOp[] = []