Merge pull request ethereumjs#637 from ethereumjs/update-to-muir-glacier-and-release

holgerd77 · web-flow · commit cfb5d89c01cc · 2019-12-20T13:08:52.000+01:00
New release v4.1.2, dependency updates + simple test for MuirGlacier support
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,31 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [4.1.2] - 2019-12-19
+
+Release adds support for the `MuirGlacier` hardfork by updating relevant
+dependencies:
+
+- `ethereumjs-tx`:
+  [v2.1.2](https://github.com/ethereumjs/ethereumjs-tx/releases/tag/v2.1.2)
+- `ethereumjs-block`:
+  [v2.2.2](https://github.com/ethereumjs/ethereumjs-block/releases/tag/v2.2.2)
+- `ethereumjs-blockchain`:
+  [v4.0.3](https://github.com/ethereumjs/ethereumjs-blockchain/releases/tag/v4.0.3)
+- `ethereumjs-common`:
+  [v1.5.0](https://github.com/ethereumjs/ethereumjs-common/releases/tag/v1.5.0)
+
+Other changes:
+
+- Upgraded `ethereumjs-util` to `v6.2.0`,
+  PR [#621](https://github.com/ethereumjs/ethereumjs-vm/pull/621)
+- Removed outdated cb param definition in `runBlockchain`,
+  PR [#623](https://github.com/ethereumjs/ethereumjs-vm/pull/623)
+- Properly output zero balance in `examples/run-transactions-complete`,
+  PR [#624](https://github.com/ethereumjs/ethereumjs-vm/pull/624)
+
+[4.1.2]: https://github.com/ethereumjs/ethereumjs-vm/compare/v4.1.1...v4.1.2
+
 ## [4.1.1] - 2019-11-19
 
 First stable `Istanbul` release passing all `StateTests` and `BlockchainTests`
diff --git a/README.md b/README.md
@@ -17,9 +17,16 @@ The VM currently supports the following hardfork rules:
 - `Constantinople`
 - `Petersburg` (default)
 - `Istanbul`
+- `MuirGlacier` (only `mainnet` and `ropsten`)
 
 If you are still looking for a [Spurious Dragon](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-607.md) compatible version of this library install the latest of the `2.2.x` series (see [Changelog](./CHANGELOG.md)).
 
+##### MuirGlacier Hardfork Support
+
+An Ethereum test suite compliant `MuirGlacier` HF implementation is available
+since the `v4.1.2` VM release. You can activate a `MuirGlacier` VM by using the
+`muirGlacier` `hardfork` option flag.
+
 ##### Istanbul Harfork Support
 
 An Ethereum test suite compliant `Istanbul` HF implementation is available
diff --git a/lib/index.ts b/lib/index.ts
@@ -98,7 +98,13 @@ export default class VM extends AsyncEventEmitter {
     } else {
       const chain = opts.chain ? opts.chain : 'mainnet'
       const hardfork = opts.hardfork ? opts.hardfork : 'petersburg'
-      const supportedHardforks = ['byzantium', 'constantinople', 'petersburg', 'istanbul']
+      const supportedHardforks = [
+        'byzantium',
+        'constantinople',
+        'petersburg',
+        'istanbul',
+        'muirGlacier',
+      ]
 
       this._common = new Common(chain, hardfork, supportedHardforks)
     }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ethereumjs-vm",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "An Ethereum VM implementation",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -53,10 +53,10 @@
     "async-eventemitter": "^0.2.2",
     "core-js-pure": "^3.0.1",
     "ethereumjs-account": "^3.0.0",
-    "ethereumjs-block": "^2.2.1",
-    "ethereumjs-blockchain": "^4.0.2",
-    "ethereumjs-common": "^1.3.2",
-    "ethereumjs-tx": "^2.1.1",
+    "ethereumjs-block": "^2.2.2",
+    "ethereumjs-blockchain": "^4.0.3",
+    "ethereumjs-common": "^1.5.0",
+    "ethereumjs-tx": "^2.1.2",
     "ethereumjs-util": "^6.2.0",
     "fake-merkle-patricia-tree": "^1.0.1",
     "functional-red-black-tree": "^1.0.1",
diff --git a/tests/api/muirGlacier/index.js b/tests/api/muirGlacier/index.js
@@ -0,0 +1,12 @@
+const tape = require('tape')
+const util = require('ethereumjs-util')
+const VM = require('../../../dist/index').default
+
+tape('General MuirGlacier VM tests', (t) => {
+  t.test('should accept muirGlacier harfork option for supported chains', (st) => {
+    let vm = new VM({ hardfork: 'muirGlacier' })
+    st.ok(vm.stateManager)
+    st.deepEqual(vm.stateManager._trie.root, util.KECCAK256_RLP, 'it has default trie')
+    st.end()
+  })
+})
