Merge pull request ethereumjs#281 from ethereumjs/es5-dist

ES5 distribution on npm

Author: holgerd77

.babelrc

@@ -0,0 +1,7 @@
+{
+  "presets": [
+    [
+      "env"
+    ]
+  ]
+}

.gitignore

@@ -64,4 +64,6 @@ build/Release
 node_modules
 package-lock.json
 
+# Build folder
+dist
 

.travis.yml

@@ -4,7 +4,8 @@ os:
 
 language: node_js
 node_js:
-  - "6"
+  - "8"
+  - "9"
 
 addons:
   apt:
@@ -23,7 +24,7 @@ env:
   global:
     - DISPLAY=:99.0
   matrix:
-    - CXX=g++-4.8 TEST_SUITE=testState
+    - CXX=g++-4.8 TEST_SUITE=testBuildIntegrity
 
 matrix:
   fast_finish: true

README.md

@@ -222,6 +222,10 @@ Running the Blockchain tests:
 
 `node ./tests/tester -b`
 
+State tests and Blockchain tests can also be run against the ``dist`` folder (default: ``lib``):
+  
+`node ./tests/tester -b --dist`
+
 State tests run significantly faster than Blockchain tests, so it is often a good choice to start fixing State tests.
 
 #### Running Specific Tests

package.json

@@ -1,8 +1,35 @@
 {
   "name": "ethereumjs-vm",
   "version": "2.3.3",
-  "description": "an ethereum VM implementation",
-  "main": "index.js",
+  "description": "An Ethereum VM implementation",
+  "main": "dist/index.js",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "coverage": "istanbul cover ./tests/tester.js -- -s",
+    "coveralls": "npm run coverage && coveralls <coverage/lcov.info",
+    "testVM": "node ./tests/tester -v",
+    "testState": "npm run build:dist && node ./tests/tester -s --dist",
+    "testBuildIntegrity": "npm run build:dist && node ./tests/tester -s --dist --test='stackOverflow'",
+    "testBlockchain": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --excludeDir='GeneralStateTests'",
+    "testBlockchainGeneralStateTests": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='GeneralStateTests'",
+    "testBlockchainBlockGasLimit": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='bcBlockGasLimitTest'",
+    "testBlockchainValid": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='bcValidBlockTest'",
+    "testBlockchainTotalDifficulty": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='bcTotalDifficultyTest'",
+    "test": "node ./tests/tester -a",
+    "lint": "standard",
+    "prepublishOnly": "npm run lint && npm run build:dist && npm run testBuildIntegrity",
+    "build:dist": "babel lib/ -d dist/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ethereumjs/ethereumjs-vm.git"
+  },
+  "keywords": [
+    "ethereum",
+    "VM"
+  ],
   "dependencies": {
     "async": "^2.1.2",
     "async-eventemitter": "^0.2.2",
@@ -17,8 +44,8 @@
     "safe-buffer": "^5.1.1"
   },
   "devDependencies": {
-    "babel-preset-es2015": "^6.24.0",
-    "babelify": "^7.3.0",
+    "babel-cli": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
     "coveralls": "^3.0.0",
     "ethereumjs-blockchain": "~2.1.0",
     "ethereumjs-testing": "https://github.com/ethereumjs/ethereumjs-testing",
@@ -32,39 +59,6 @@
     "standard": "^10.0.0",
     "tape": "4.6.3"
   },
-  "browserify": {
-    "transform": [
-      [
-        "babelify",
-        {
-          "presets": [
-            "es2015"
-          ]
-        }
-      ]
-    ]
-  },
-  "scripts": {
-    "testVM": "node ./tests/tester -v",
-    "testState": "node ./tests/tester -s",
-    "testBlockchain": "node --stack-size=1500 ./tests/tester -b --excludeDir='GeneralStateTests'",
-    "testBlockchainGeneralStateTests": "node --stack-size=1500 ./tests/tester -b --dir='GeneralStateTests'",
-    "testBlockchainBlockGasLimit": "node --stack-size=1500 ./tests/tester -b --dir='bcBlockGasLimitTest'",
-    "testBlockchainValid": "node --stack-size=1500 ./tests/tester -b --dir='bcValidBlockTest'",
-    "testBlockchainTotalDifficulty": "node --stack-size=1500 ./tests/tester -b --dir='bcTotalDifficultyTest'",
-    "lint": "standard",
-    "test": "node ./tests/tester -a",
-    "coverage": "istanbul cover ./tests/tester.js -- -s",
-    "coveralls": "npm run coverage && coveralls <coverage/lcov.info"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ethereumjs/ethereumjs-vm.git"
-  },
-  "keywords": [
-    "ethereum",
-    "VM"
-  ],
   "author": "mjbecze <[email protected]>",
   "contributors": [
     "Alex Beregszaszi <[email protected]>"

tests/BlockchainTestsRunner.js

@@ -5,7 +5,6 @@ const Trie = require('merkle-patricia-tree/secure')
 const Block = require('ethereumjs-block')
 const Blockchain = require('ethereumjs-blockchain')
 const BlockHeader = require('ethereumjs-block/header.js')
-const VM = require('../')
 const Level = require('levelup')
 
 var cacheDB = new Level('./.cachedb')
@@ -16,6 +15,12 @@ module.exports = function runBlockchainTest (options, testData, t, cb) {
   var state = new Trie()
   var blockchain = new Blockchain(blockchainDB)
   blockchain.ethash.cacheDB = cacheDB
+  var VM
+  if (options.dist) {
+    VM = require('../dist/index.js')
+  } else {
+    VM = require('../lib/index.js')
+  }
   var vm = new VM({
     state: state,
     blockchain: blockchain

tests/GeneralStateTestsRunner.js

@@ -1,5 +1,4 @@
 const async = require('async')
-const VM = require('../index.js')
 const testUtil = require('./util')
 const Trie = require('merkle-patricia-tree/secure')
 const ethUtil = require('ethereumjs-util')
@@ -45,6 +44,12 @@ function runTestCase (options, testData, t, cb) {
 
   async.series([
     function (done) {
+      var VM
+      if (options.dist) {
+        VM = require('../dist/index.js')
+      } else {
+        VM = require('../lib/index.js')
+      }
       vm = new VM({
         state: state
       })

tests/tester.js

@@ -55,7 +55,8 @@ const skipSlow = [
   'static_Call1MB1024Calldepth', // slow
   'static_Callcode50000', // slow
   'static_Return50000', // slow
-  'static_Return50000_2' // slow
+  'static_Return50000_2', // slow
+  'QuadraticComplexitySolidity_CallDataCopy'
 ]
 
 /*