Update for chain refactor: lib/net/protocol and lib/rpc

Author: cgewecke

lib/net/protocol/ethprotocol.ts

@@ -1,6 +1,7 @@
+import { Chain } from './../../blockchain'
 import { Message, Protocol } from './protocol'
 import { BN, bufferToInt } from 'ethereumjs-util'
-const Block = require('ethereumjs-block')
+import { BlockHeader, BlockHeaderBuffer } from '@ethereumjs/block'
 
 const messages: Message[] = [
   {
@@ -29,8 +30,9 @@ const messages: Message[] = [
   {
     name: 'BlockHeaders',
     code: 0x04,
-    encode: (headers: any[]) => headers.map((h) => h.raw),
-    decode: (headers: any[]) => headers.map((raw) => new Block.Header(raw)),
+    encode: (headers: BlockHeader[]) => headers.map((h) => h.raw()),
+    decode: (headers: BlockHeaderBuffer[]) =>
+      headers.map((h) => BlockHeader.fromValuesArray(h, {})),
   },
   {
     name: 'GetBlockBodies',
@@ -48,7 +50,7 @@ const messages: Message[] = [
  * @memberof module:net/protocol
  */
 export class EthProtocol extends Protocol {
-  private chain: any
+  private chain: Chain
 
   /**
    * Create eth protocol
@@ -107,7 +109,7 @@ export class EthProtocol extends Protocol {
     return {
       networkId: this.chain.networkId,
       td: this.chain.blocks.td.toArrayLike(Buffer),
-      bestHash: this.chain.blocks.latest.hash(),
+      bestHash: this.chain.blocks.latest!.hash(),
       genesisHash: this.chain.genesis.hash,
     }
   }

lib/net/protocol/lesprotocol.ts

@@ -1,6 +1,6 @@
 import { Message, Protocol } from './protocol'
 import { BN, bufferToInt } from 'ethereumjs-util'
-const Block = require('ethereumjs-block')
+import { BlockHeader, BlockHeaderBuffer } from '@ethereumjs/block'
 
 const id = new BN(0)
 
@@ -45,12 +45,12 @@ const messages: Message[] = [
     encode: ({ reqId, bv, headers }: any) => [
       new BN(reqId).toArrayLike(Buffer),
       new BN(bv).toArrayLike(Buffer),
-      headers.map((h: any) => h.raw),
+      headers.map((h: any) => h.raw()),
     ],
     decode: ([reqId, bv, headers]: any) => ({
       reqId: new BN(reqId),
       bv: new BN(bv),
-      headers: headers.map((raw: Buffer[]) => new Block.Header(raw)),
+      headers: headers.map((h: BlockHeaderBuffer) => BlockHeader.fromValuesArray(h, {})),
     }),
   },
 ]

lib/rpc/modules/eth.ts

@@ -1,12 +1,13 @@
+import { Chain } from '../../blockchain'
 import { middleware, validators } from '../validation'
-import { toBuffer, bufferToHex } from 'ethereumjs-util'
+import { toBuffer, stripHexPrefix, BN } from 'ethereumjs-util'
 
 /**
  * eth_* RPC module
  * @memberof module:rpc/modules
  */
 export class Eth {
-  private _chain: any
+  private _chain: Chain
   public ethVersion: any
 
   /**
@@ -50,8 +51,7 @@ export class Eth {
   async blockNumber(_params = [], cb: (err: Error | null, val?: string) => void) {
     try {
       const latestHeader = await this._chain.getLatestHeader()
-      const latestBlockNumber = bufferToHex(latestHeader.number)
-      cb(null, `${latestBlockNumber}`)
+      cb(null, `0x${latestHeader.number.toString(16)}`)
     } catch (err) {
       cb(err)
     }
@@ -65,16 +65,15 @@ export class Eth {
    * as the second argument
    * @return {Promise}
    */
-  async getBlockByNumber(params: any[] | boolean[], cb: (err: Error | null, val?: any) => void) {
+  async getBlockByNumber(params: [string, boolean], cb: (err: Error | null, val?: any) => void) {
     // eslint-disable-next-line prefer-const
     let [blockNumber, includeTransactions] = params
-
-    blockNumber = Number.parseInt(blockNumber, 16)
+    const blockNumberBN = new BN(stripHexPrefix(blockNumber), 16)
     try {
-      const block = await this._chain.getBlock(blockNumber)
-      const json = block.toJSON(true)
+      const block = await this._chain.getBlock(blockNumberBN)
+      const json = block.toJSON()
       if (!includeTransactions) {
-        json.transactions = json.transactions.map((tx: any) => tx.hash)
+        json.transactions = json.transactions!.map((tx: any) => tx.hash)
       }
       cb(null, json)
     } catch (err) {
@@ -95,11 +94,10 @@ export class Eth {
 
     try {
       const block = await this._chain.getBlock(toBuffer(blockHash))
-
-      const json = block.toJSON(true)
+      const json = block.toJSON()
 
       if (!includeTransactions) {
-        json.transactions = json.transactions.map((tx: any) => tx.hash)
+        json.transactions = json.transactions!.map((tx: any) => tx.hash)
       }
       cb(null, json)
     } catch (err) {
@@ -115,16 +113,16 @@ export class Eth {
    * @return {Promise}
    */
   async getBlockTransactionCountByHash(
-    params: string[],
+    params: [string],
     cb: (err: Error | null, val?: any) => void
   ) {
     const [blockHash] = params
 
     try {
       const block = await this._chain.getBlock(toBuffer(blockHash))
 
-      const json = block.toJSON(true)
-      cb(null, `0x${json.transactions.length.toString(16)}`)
+      const json = block.toJSON()
+      cb(null, `0x${json.transactions!.length.toString(16)}`)
     } catch (err) {
       cb(err)
     }