Update for @ethereumjs/block @ethereumjs/common: lib/service, lib/sync, lib/util

Author: cgewecke

lib/service/ethereumservice.ts

@@ -1,11 +1,11 @@
 import { Service } from './service'
 import { FlowControl } from '../net/protocol/flowcontrol'
 import { Chain } from '../blockchain'
-import Common from 'ethereumjs-common'
+import Common from '@ethereumjs/common'
 
 const defaultOptions = {
   lightserv: false,
-  common: new Common('mainnet', 'chainstart'),
+  common: new Common({ chain: 'mainnet', hardfork: 'chainstart' }),
   minPeers: 3,
   timeout: 8000,
   interval: 1000,

lib/service/fastethereumservice.ts

@@ -96,7 +96,7 @@ export class FastEthereumService extends EthereumService {
     } else if (message.name === 'GetBlockBodies') {
       const hashes = message.data
       const blocks = await Promise.all(hashes.map((hash: any) => this.chain.getBlock(hash)))
-      const bodies: any = blocks.map((block: any) => block.raw.slice(1))
+      const bodies: any = blocks.map((block: any) => block.raw().slice(1))
       ;(peer.eth as BoundProtocol).send('BlockBodies', bodies)
     } else if (message.name === 'NewBlockHashes') {
       this.synchronizer.announced(message.data, peer)

lib/sync/fetcher/blockfetcher.ts

@@ -1,5 +1,5 @@
 import { Fetcher } from './fetcher'
-const Block = require('ethereumjs-block')
+import { Block, BlockBodyBuffer } from '@ethereumjs/block'
 import { BN } from 'ethereumjs-util'
 import { Peer } from '../../net/peer'
 import { Chain } from '../../blockchain'
@@ -67,8 +67,8 @@ export class BlockFetcher extends Fetcher {
     const { first, count } = task
     const headers = await peer.eth.getBlockHeaders({ block: first, max: count })
     const bodies = await peer.eth.getBlockBodies(headers.map((h: any) => h.hash()))
-    const blocks = bodies.map(
-      (body: any, i: number) => new Block([headers[i]].concat(body), { common: this.common })
+    const blocks = bodies.map(([txsData, unclesData]: BlockBodyBuffer, i: number) =>
+      Block.fromValuesArray([headers[i].raw(), txsData, unclesData], { common: this.common })
     )
     return { blocks }
   }

lib/sync/fetcher/fetcher.ts

@@ -1,11 +1,11 @@
 import { Readable, Writable } from 'stream'
 const Heap = require('qheap')
-import Common from 'ethereumjs-common'
+import Common from '@ethereumjs/common'
 import { defaultLogger } from '../../logging'
 import { PeerPool } from '../../net/peerpool'
 
 const defaultOptions = {
-  common: new Common('mainnet', 'chainstart'),
+  common: new Common({ chain: 'mainnet', hardfork: 'chainstart' }),
   logger: defaultLogger,
   timeout: 8000,
   interval: 1000,

lib/sync/sync.ts

@@ -1,13 +1,13 @@
 import { Peer } from '../net/peer/peer'
 import { EventEmitter } from 'events'
-import Common from 'ethereumjs-common'
+import Common from '@ethereumjs/common'
 import { defaultLogger } from '../logging'
 import { PeerPool } from '../net/peerpool'
 import { Chain } from '../blockchain'
 import { FlowControl } from '../net/protocol'
 
 const defaultOptions = {
-  common: new Common('mainnet', 'chainstart'),
+  common: new Common({ chain: 'mainnet', hardfork: 'chainstart' }),
   logger: defaultLogger,
   interval: 1000,
   minPeers: 3,

lib/util/parse.ts

@@ -1,5 +1,5 @@
 import Account from 'ethereumjs-account'
-const Block = require('ethereumjs-block')
+import { BlockHeader } from '@ethereumjs/block'
 const Trie = require('merkle-patricia-tree/secure')
 import * as util from 'ethereumjs-util'
 import * as url from 'url'
@@ -93,16 +93,21 @@ async function parseGethState(alloc: any) {
 }
 
 async function parseGethHeader(json: any) {
-  const header = new Block.Header()
-  header.gasLimit = json.gasLimit
-  header.difficulty = json.difficulty
-  header.extraData = json.extraData
-  header.number = Buffer.from([])
-  header.nonce = json.nonce
-  header.timestamp = json.timestamp
-  header.mixHash = json.mixHash
-  header.stateRoot = (await parseGethState(json.alloc)).root
-  return header
+  return BlockHeader.fromHeaderData(
+    {
+      gasLimit: new util.BN(util.stripHexPrefix(json.gasLimit), 16),
+      difficulty: new util.BN(util.stripHexPrefix(json.difficulty), 16),
+      extraData: toBuffer(json.extraData),
+      number: new util.BN(util.stripHexPrefix(json.number), 16),
+      nonce: toBuffer(json.nonce),
+      timestamp: new util.BN(util.stripHexPrefix(json.timestamp), 16),
+      mixHash: toBuffer(json.mixHash),
+      stateRoot: (await parseGethState(json.alloc)).root,
+    },
+    {
+      // TODO: Add optional Common param here?
+    }
+  )
 }
 
 async function parseGethParams(json: any) {