Merge branch 'master' into statemanager-iface

ethereumjs · Jun 5, 2020 · 5ff3354 · 5ff3354
2 parents 282fdfb + 28b8fa4
commit 5ff3354
Show file tree

Hide file tree

Showing 8 changed files with 209 additions and 55 deletions.
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -63,5 +63,7 @@
       "email": "Holger.Drewes@gmail.com"
     }
   ],
-  "dependencies": {}
+  "dependencies": {
+    "crc-32": "^1.2.0"
+  }
 }
diff --git a/packages/common/src/chains/goerli.json b/packages/common/src/chains/goerli.json
@@ -16,43 +16,53 @@
   "hardforks": [
     {
       "name": "chainstart",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xa3f5ab08"
     },
     {
       "name": "homestead",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xa3f5ab08"
     },
     {
       "name": "dao",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xa3f5ab08"
     },
     {
       "name": "tangerineWhistle",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xa3f5ab08"
     },
     {
       "name": "spuriousDragon",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xa3f5ab08"
     },
     {
       "name": "byzantium",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xa3f5ab08"
     },
     {
       "name": "constantinople",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xa3f5ab08"
     },
     {
       "name": "petersburg",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xa3f5ab08"
     },
     {
       "name": "istanbul",
-      "block": 1561651
+      "block": 1561651,
+      "forkHash": "0xc25efa5c"
     },
     {
       "name": "berlin",
-      "block": null
+      "block": null,
+      "forkHash": null
     }
   ],
   "bootstrapNodes": [

diff --git a/packages/common/src/chains/kovan.json b/packages/common/src/chains/kovan.json
@@ -16,43 +16,53 @@
   "hardforks": [
     {
       "name": "chainstart",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x10ffe56"
     },
     {
       "name": "homestead",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x10ffe56"
     },
     {
       "name": "dao",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x10ffe56"
     },
     {
       "name": "tangerineWhistle",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x10ffe56"
     },
     {
       "name": "spuriousDragon",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x10ffe56"
     },
     {
       "name": "byzantium",
-      "block": 5067000
+      "block": 5067000,
+      "forkHash": "0x7f83c620"
     },
     {
       "name": "constantinople",
-      "block": 9200000
+      "block": 9200000,
+      "forkHash": "0xa94e3dc4"
     },
     {
       "name": "petersburg",
-      "block": 10255201
+      "block": 10255201,
+      "forkHash": "0x186874aa"
     },
     {
       "name": "istanbul",
-      "block": 14111141
+      "block": 14111141,
+      "forkHash": "0x7f6599a6"
     },
     {
       "name": "berlin",
-      "block": null
+      "block": null,
+      "forkHash": null
     }
   ],
   "bootstrapNodes": [

diff --git a/packages/common/src/chains/mainnet.json b/packages/common/src/chains/mainnet.json
@@ -16,47 +16,58 @@
   "hardforks": [
     {
       "name": "chainstart",
-      "block": 0
+      "block": 0,
+      "forkHash": "0xfc64ec04"
     },
     {
       "name": "homestead",
-      "block": 1150000
+      "block": 1150000,
+      "forkHash": "0x97c2c34c"
     },
     {
       "name": "dao",
-      "block": 1920000
+      "block": 1920000,
+      "forkHash": "0x91d1f948"
     },
     {
       "name": "tangerineWhistle",
-      "block": 2463000
+      "block": 2463000,
+      "forkHash": "0x7a64da13"
     },
     {
       "name": "spuriousDragon",
-      "block": 2675000
+      "block": 2675000,
+      "forkHash": "0x3edd5b10"
     },
     {
       "name": "byzantium",
-      "block": 4370000
+      "block": 4370000,
+      "forkHash": "0xa00bc324"
     },
     {
       "name": "constantinople",
-      "block": 7280000
+      "block": 7280000,
+      "forkHash": "0x668db0af"
     },
     {
       "name": "petersburg",
-      "block": 7280000
+      "block": 7280000,
+      "forkHash": "0x668db0af"
     },
     {
       "name": "istanbul",
-      "block": 9069000
+      "block": 9069000,
+      "forkHash": "0x879d6e30"
     },
     {
       "name": "muirGlacier",
-      "block": 9200000
+      "block": 9200000,
+      "forkHash": "0xe029e991"
     },
     {
       "name": "berlin",
-      "block": null
+      "block": null,
+      "forkHash": null
     }
   ],
   "bootstrapNodes": [

diff --git a/packages/common/src/chains/rinkeby.json b/packages/common/src/chains/rinkeby.json
@@ -16,43 +16,53 @@
   "hardforks": [
     {
       "name": "chainstart",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x3b8e0691"
     },
     {
       "name": "homestead",
-      "block": 1
+      "block": 1,
+      "forkHash": "0x60949295"
     },
     {
       "name": "dao",
-      "block": null
+      "block": null,
+      "forkHash": null
     },
     {
       "name": "tangerineWhistle",
-      "block": 2
+      "block": 2,
+      "forkHash": "0x8bde40dd"
     },
     {
       "name": "spuriousDragon",
-      "block": 3
+      "block": 3,
+      "forkHash": "0xcb3a64bb"
     },
     {
       "name": "byzantium",
-      "block": 1035301
+      "block": 1035301,
+      "forkHash": "0x8d748b57"
     },
     {
       "name": "constantinople",
-      "block": 3660663
+      "block": 3660663,
+      "forkHash": "0xe49cab14"
     },
     {
       "name": "petersburg",
-      "block": 4321234
+      "block": 4321234,
+      "forkHash": "0xafec6b27"
     },
     {
       "name": "istanbul",
-      "block": 5435345
+      "block": 5435345,
+      "forkHash": "0xcbdb8838"
     },
     {
       "name": "berlin",
-      "block": null
+      "block": null,
+      "forkHash": null
     }
   ],
   "bootstrapNodes": [

diff --git a/packages/common/src/chains/ropsten.json b/packages/common/src/chains/ropsten.json
@@ -16,47 +16,58 @@
   "hardforks": [
     {
       "name": "chainstart",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x30c7ddbc"
     },
     {
       "name": "homestead",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x30c7ddbc"
     },
     {
       "name": "dao",
-      "block": null
+      "block": null,
+      "forkHash": null
     },
     {
       "name": "tangerineWhistle",
-      "block": 0
+      "block": 0,
+      "forkHash": "0x30c7ddbc"
     },
     {
       "name": "spuriousDragon",
-      "block": 10
+      "block": 10,
+      "forkHash": "0x63760190"
     },
     {
       "name": "byzantium",
-      "block": 1700000
+      "block": 1700000,
+      "forkHash": "0x3ea159c7"
     },
     {
       "name": "constantinople",
-      "block": 4230000
+      "block": 4230000,
+      "forkHash": "0x97b544f3"
     },
     {
       "name": "petersburg",
-      "block": 4939394
+      "block": 4939394,
+      "forkHash": "0xd6e2149b"
     },
     {
       "name": "istanbul",
-      "block": 6485846
+      "block": 6485846,
+      "forkHash": "0x4bc66396"
     },
     {
       "name": "muirGlacier",
-      "block": 7117117
+      "block": 7117117,
+      "forkHash": "0x6727ef90"
     },
     {
       "name": "berlin",
-      "block": null
+      "block": null,
+      "forkHash": null
     }
   ],
   "bootstrapNodes": [