block -> rename Header to BlockHeader

packages/block/src/block.ts

@@ -2,16 +2,16 @@ import { BaseTrie as Trie } from 'merkle-patricia-tree'
 import { BN, rlp, keccak256, KECCAK256_RLP, baToJSON } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
 import { Transaction, TxOptions } from '@ethereumjs/tx'
-import { Header } from './header'
+import { BlockHeader } from './header'
 import { Blockchain, BlockData, BlockOptions } from './types'
 
 /**
  * An object that represents the block
  */
 export class Block {
-  public readonly header: Header
+  public readonly header: BlockHeader
   public readonly transactions: Transaction[] = []
-  public readonly uncleHeaders: Header[] = []
+  public readonly uncleHeaders: BlockHeader[] = []
   public readonly txTrie = new Trie()
 
   private readonly _common: Common
@@ -26,7 +26,7 @@ export class Block {
     const txsData = blockData.transactions || []
     const uncleHeadersData = blockData.uncleHeaders || []
 
-    const header = Header.fromHeaderData(headerData, opts)
+    const header = BlockHeader.fromHeaderData(headerData, opts)
 
     // parse transactions
     let transactions = []
@@ -37,7 +37,7 @@ export class Block {
     // parse uncle headers
     let uncleHeaders = []
     for (const uncleHeaderData of uncleHeadersData) {
-      uncleHeaders.push(Header.fromHeaderData(uncleHeaderData, opts))
+      uncleHeaders.push(BlockHeader.fromHeaderData(uncleHeaderData, opts))
     }
 
     return new Block(header, transactions, uncleHeaders, opts)
@@ -64,7 +64,7 @@ export class Block {
     const txsData = values[1] || []
     const uncleHeadersData = values[2] || []
 
-    const header = Header.fromValuesArray(headerArray, opts)
+    const header = BlockHeader.fromValuesArray(headerArray, opts)
 
     // parse transactions
     let transactions = []
@@ -75,7 +75,7 @@ export class Block {
     // parse uncle headers
     let uncleHeaders = []
     for (const uncleHeaderData of uncleHeadersData) {
-      uncleHeaders.push(Header.fromRLPSerializedHeader(uncleHeaderData, opts))
+      uncleHeaders.push(BlockHeader.fromRLPSerializedHeader(uncleHeaderData, opts))
     }
 
     return new Block(header, transactions, uncleHeaders, opts)
@@ -92,9 +92,9 @@ export class Block {
    * @param options - The options for this block (like the chain setup)
    */
   constructor(
-    header: Header,
+    header: BlockHeader,
     transactions: Transaction[],
-    uncleHeaders: Header[],
+    uncleHeaders: BlockHeader[],
     //data: Buffer | [Buffer[], Buffer[], Buffer[]] | BlockData = {},
     opts: BlockOptions = {},
   ) {
@@ -266,7 +266,7 @@ export class Block {
     await this.txTrie.put(rlp.encode(txIndex), tx.serialize())
   }
 
-  private _validateUncleHeader(uncleHeader: Header, blockchain: Blockchain) {
+  private _validateUncleHeader(uncleHeader: BlockHeader, blockchain: Blockchain) {
     // TODO: Validate that the uncle header hasn't been included in the blockchain yet.
     // This is not possible in ethereumjs-blockchain since this PR was merged:
     // https://github.com/ethereumjs/ethereumjs-blockchain/pull/47

packages/block/src/header-from-rpc.ts

@@ -1,4 +1,4 @@
-import { Header } from './header'
+import { BlockHeader } from './header'
 import { KECCAK256_NULL, toBuffer } from 'ethereumjs-util'
 import { BlockOptions } from './types'
 
@@ -9,7 +9,7 @@ import { BlockOptions } from './types'
  * @param chainOptions - An object describing the blockchain
  */
 export default function blockHeaderFromRpc(blockParams: any, options?: BlockOptions) {
-  const blockHeader = Header.fromHeaderData(
+  const blockHeader = BlockHeader.fromHeaderData(
     {
       parentHash: blockParams.parentHash,
       uncleHash: blockParams.sha3Uncles,

packages/block/src/header.ts

@@ -18,7 +18,7 @@ import { checkBufferLength } from './util'
 /**
  * An object that represents the block header
  */
-export class Header {
+export class BlockHeader {
   public readonly parentHash: Buffer
   public readonly uncleHash: Buffer
   public readonly coinbase: Buffer
@@ -56,7 +56,7 @@ export class Header {
       nonce,
     } = headerData
 
-    return new Header(
+    return new BlockHeader(
       parentHash ? checkBufferLength(toBuffer(parentHash), 32) : zeros(32),
       uncleHash ? toBuffer(uncleHash) : KECCAK256_RLP_ARRAY,
       coinbase ? checkBufferLength(toBuffer(coinbase), 20) : zeros(20),
@@ -83,7 +83,7 @@ export class Header {
       throw new Error('Invalid serialized header input. Must be array')
     }
 
-    return Header.fromValuesArray(values, opts)
+    return BlockHeader.fromValuesArray(values, opts)
   }
 
   public static fromValuesArray(values: Buffer[], opts: BlockOptions) {
@@ -108,7 +108,7 @@ export class Header {
       mixHash,
       nonce,
     ] = values
-    return new Header(
+    return new BlockHeader(
       parentHash,
       uncleHash,
       coinbase,

packages/block/src/index.ts

@@ -1,3 +1,3 @@
 export { Block } from './block'
-export { Header } from './header'
+export { BlockHeader } from './header'
 export * from './types'

packages/block/test/header.spec.ts

@@ -1,7 +1,7 @@
 import * as tape from 'tape'
 import Common from '@ethereumjs/common'
 import { rlp, toBuffer, zeros, KECCAK256_RLP, KECCAK256_RLP_ARRAY } from 'ethereumjs-util'
-import { Header } from '../src/header'
+import { BlockHeader } from '../src/header'
 //import { Block } from '../src/block'
 
 tape('[Block]: Header functions', function (t) {
@@ -24,7 +24,7 @@ tape('[Block]: Header functions', function (t) {
       st.deepEqual(header.nonce, zeros(8))
     }
 
-    let header = Header.fromHeaderData({})
+    let header = BlockHeader.fromHeaderData({})
     compareDefaultHeader(st, header)
 
     /*const block = new Block()
@@ -55,16 +55,16 @@ tape('[Block]: Header functions', function (t) {
   })*/
 
   t.test('should test isGenesis', function (st) {
-    let header = Header.fromHeaderData({})
+    let header = BlockHeader.fromHeaderData({})
     st.equal(header.isGenesis(), false)
-    header = Header.fromHeaderData({}, { initWithGenesisHeader: true })
+    header = BlockHeader.fromHeaderData({}, { initWithGenesisHeader: true })
     st.equal(header.isGenesis(), true)
     st.end()
   })
 
   const testDataGenesis = require('./testdata/genesishashestest.json').test
   t.test('should test genesis hashes (mainnet default)', function (st) {
-    const header = Header.fromHeaderData({}, { initWithGenesisHeader: true })
+    const header = BlockHeader.fromHeaderData({}, { initWithGenesisHeader: true })
     st.strictEqual(
       header.hash().toString('hex'),
       testDataGenesis.genesis_hash,
@@ -75,7 +75,7 @@ tape('[Block]: Header functions', function (t) {
 
   t.test('should test genesis parameters (ropsten)', function (st) {
     const common = new Common({ chain: 'ropsten', hardfork: 'chainstart' })
-    const genesisHeader = Header.fromHeaderData({}, { common, initWithGenesisHeader: true })
+    const genesisHeader = BlockHeader.fromHeaderData({}, { common, initWithGenesisHeader: true })
     const ropstenStateRoot = '0x217b0bbcfb72e2d57e28f33cb361b9983513177755dc3f33ce3e7022ed62b77b'
     st.strictEqual(
       genesisHeader.stateRoot.toString('hex'),