common -> custom chains: moved default hardfork to be a parameter in the chain json files (all set to istanbul for backwards compatibility)

Author: holgerd77

packages/common/src/chains/goerli.json

@@ -2,6 +2,7 @@
   "name": "goerli",
   "chainId": 5,
   "networkId": 5,
+  "defaultHardfork": "istanbul",
   "consensus": {
     "type": "poa",
     "algorithm": "clique"

packages/common/src/chains/kovan.json

@@ -2,6 +2,7 @@
   "name": "kovan",
   "chainId": 42,
   "networkId": 42,
+  "defaultHardfork": "istanbul",
   "consensus": {
     "type": "poa",
     "algorithm": "aura"

packages/common/src/chains/mainnet.json

@@ -2,6 +2,7 @@
   "name": "mainnet",
   "chainId": 1,
   "networkId": 1,
+  "defaultHardfork": "istanbul",
   "consensus": {
     "type": "pow",
     "algorithm": "ethash"

packages/common/src/chains/rinkeby.json

@@ -2,6 +2,7 @@
   "name": "rinkeby",
   "chainId": 4,
   "networkId": 4,
+  "defaultHardfork": "istanbul",
   "consensus": {
     "type": "poa",
     "algorithm": "clique"

packages/common/src/chains/ropsten.json

@@ -2,6 +2,7 @@
   "name": "ropsten",
   "chainId": 3,
   "networkId": 3,
+  "defaultHardfork": "istanbul",
   "consensus": {
     "type": "pow",
     "algorithm": "ethash"

packages/common/src/index.ts

@@ -2,7 +2,7 @@ import { buf as crc32Buffer } from 'crc-32'
 import { _getInitializedChains } from './chains'
 import { hardforks as HARDFORK_CHANGES } from './hardforks'
 import { EIPs } from './eips'
-import { BootstrapNode, Chain, GenesisBlock, Hardfork } from './types'
+import { Chain } from './types'
 
 /**
  * Options for instantiating a [[Common]] instance.
@@ -57,7 +57,7 @@ interface hardforkOptions {
  * Common class to access chain and hardfork parameters
  */
 export default class Common {
-  readonly DEFAULT_HARDFORK: string = 'istanbul'
+  readonly DEFAULT_HARDFORK: string
 
   private _chainParams: Chain
   private _hardfork: string
@@ -117,6 +117,7 @@ export default class Common {
   constructor(opts: CommonOpts) {
     this._customChains = opts.customChains ?? []
     this._chainParams = this.setChain(opts.chain)
+    this.DEFAULT_HARDFORK = this._chainParams.defaultHardfork
     this._hardfork = this.DEFAULT_HARDFORK
     if (opts.supportedHardforks) {
       this._supportedHardforks = opts.supportedHardforks
@@ -513,7 +514,7 @@ export default class Common {
     // Logic: if accumulator is still null and on the first occurence of
     // a block greater than the current hfBlock set the accumulator,
     // pass on the accumulator as the final result from this time on
-    const nextHfBlock = (this.hardforks() as any).reduce((acc: number, hf: any) => {
+    const nextHfBlock = this.hardforks().reduce((acc: number, hf: any) => {
       return hf.block > hfBlock && acc === null ? hf.block : acc
     }, null)
     return nextHfBlock
@@ -539,7 +540,7 @@ export default class Common {
     const genesis = Buffer.from(this.genesis().hash.substr(2), 'hex')
 
     let hfBuffer = Buffer.alloc(0)
-    let prevBlock: number | null = 0
+    let prevBlock = 0
     for (const hf of this.hardforks()) {
       const block = hf.block
 
@@ -565,7 +566,7 @@ export default class Common {
    * Returns an eth/64 compliant fork hash (EIP-2124)
    * @param hardfork Hardfork name, optional if HF set
    */
-  forkHash(hardfork?: string): string | null {
+  forkHash(hardfork?: string) {
     hardfork = this._chooseHardfork(hardfork, false)
     const data = this._getHardfork(hardfork)
     if (data['block'] === null) {

packages/common/src/types.ts

@@ -16,6 +16,7 @@ export interface Chain {
   name: string
   chainId: number
   networkId: number
+  defaultHardfork: string
   comment: string
   url: string
   genesis: GenesisBlock

packages/common/tests/data/energyWebChain.json

@@ -2,6 +2,7 @@
   "name": "energyWebChain",
   "chainId": 246,
   "networkId": 246,
+  "defaultHardfork": "istanbul",
   "consensus": {
     "type": "pow",
     "algorithm": "ethash"

packages/common/tests/data/testnet.json

@@ -2,6 +2,7 @@
   "name": "testnet",
   "chainId": 12345,
   "networkId": 12345,
+  "defaultHardfork": "byzantium",
   "consensus": {
     "type": "pow",
     "algorithm": "ethash"

packages/common/tests/data/volta.json

@@ -2,6 +2,7 @@
   "name": "volta",
   "chainId": 73799,
   "networkId": 73799,
+  "defaultHardfork": "istanbul",
   "consensus": {
     "type": "pow",
     "algorithm": "ethash"