Merge pull request ethereumjs#755 from ethereumjs/berlin-common-boilerplate

holgerd77 · web-flow · commit df1ac8422fcb · 2020-05-29T09:13:14.000+02:00
Add common boilerplate for Berlin hardfork
diff --git a/packages/common/src/chains/goerli.json b/packages/common/src/chains/goerli.json
@@ -67,6 +67,12 @@
       "block": 1561651,
       "consensus": "poa",
       "finality": null
+    },
+    {
+      "name": "berlin",
+      "block": null,
+      "consensus": "poa",
+      "finality": null
     }
   ],
   "bootstrapNodes": [
diff --git a/packages/common/src/chains/kovan.json b/packages/common/src/chains/kovan.json
@@ -67,6 +67,12 @@
       "block": 14111141,
       "consensus": "poa",
       "finality": null
+    },
+    {
+      "name": "berlin",
+      "block": null,
+      "consensus": "poa",
+      "finality": null
     }
   ],
   "bootstrapNodes": [
diff --git a/packages/common/src/chains/mainnet.json b/packages/common/src/chains/mainnet.json
@@ -73,6 +73,12 @@
       "block": 9200000,
       "consensus": "pow",
       "finality": null
+    },
+    {
+      "name": "berlin",
+      "block": null,
+      "consensus": "pow",
+      "finality": null
     }
   ],
   "bootstrapNodes": [
diff --git a/packages/common/src/chains/rinkeby.json b/packages/common/src/chains/rinkeby.json
@@ -67,6 +67,12 @@
       "block": 5435345,
       "consensus": "poa",
       "finality": null
+    },
+    {
+      "name": "berlin",
+      "block": null,
+      "consensus": "poa",
+      "finality": null
     }
   ],
   "bootstrapNodes": [
diff --git a/packages/common/src/chains/ropsten.json b/packages/common/src/chains/ropsten.json
@@ -73,6 +73,12 @@
       "block": 7117117,
       "consensus": "pow",
       "finality": null
+    },
+    {
+      "name": "berlin",
+      "block": null,
+      "consensus": "pow",
+      "finality": null
     }
   ],
   "bootstrapNodes": [
diff --git a/packages/common/src/hardforks/berlin.json b/packages/common/src/hardforks/berlin.json
@@ -0,0 +1,14 @@
+{
+  "name": "berlin",
+  "comment": "HF targeted for July 2020 following the Muir Glacier HF",
+  "eip": {
+    "url": "https://eips.ethereum.org/EIPS/eip-2070",
+    "status": "Draft"
+  },
+  "gasConfig": {},
+  "gasPrices": {},
+  "vm": {},
+  "pow": {},
+  "casper": {},
+  "sharding": {}
+}
diff --git a/packages/common/src/hardforks/index.ts b/packages/common/src/hardforks/index.ts
@@ -9,4 +9,5 @@ export const hardforks = [
   ['petersburg', require('./petersburg.json')],
   ['istanbul', require('./istanbul.json')],
   ['muirGlacier', require('./muirGlacier.json')],
+  ['berlin', require('./berlin.json')],
 ]
diff --git a/packages/common/tests/hardforks.ts b/packages/common/tests/hardforks.ts
@@ -13,6 +13,7 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
       'constantinople',
       'petersburg',
       'istanbul',
+      'berlin',
     ]
     let c
 

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@ export const hardforks = [`
`9`	`9`	`['petersburg', require('./petersburg.json')],`
`10`	`10`	`['istanbul', require('./istanbul.json')],`
`11`	`11`	`['muirGlacier', require('./muirGlacier.json')],`
	`12`	`+ ['berlin', require('./berlin.json')],`
`12`	`13`	`]`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {`
`13`	`13`	`'constantinople',`
`14`	`14`	`'petersburg',`
`15`	`15`	`'istanbul',`
	`16`	`+ 'berlin',`
`16`	`17`	`]`
`17`	`18`	`let c`
`18`	`19`