Merge pull request #146 from ethereumjs/create2

add generateAddress2 for CREATE2

Author: holgerd77

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - "4"
   - "6"
   - "8"
+  - "10"
 env:
   - CXX=g++-4.8
 addons:

docs/index.md

@@ -534,6 +534,31 @@ exports.generateAddress = function (from, nonce) {
   return exports.rlphash([from, nonce]).slice(-20)
 }
 
+/**
+ * Generates an address for a contract created using CREATE2
+ * @param {Buffer} from the address which is creating this new address
+ * @param {Buffer} salt a salt
+ * @param {Buffer} initCode the init code of the contract being created
+ * @return {Buffer}
+ */
+exports.generateAddress2 = function (from, salt, initCode) {
+  from = exports.toBuffer(from)
+  salt = exports.toBuffer(salt)
+  initCode = exports.toBuffer(initCode)
+
+  assert(from.length === 20)
+  assert(salt.length === 32)
+
+  let address = exports.keccak256(Buffer.concat([
+    Buffer.from('ff', 'hex'),
+    from,
+    salt,
+    exports.keccak256(initCode)
+  ]))
+
+  return address.slice(-20)
+}
+
 /**
  * Returns true if the supplied address belongs to a precompiled account (Byzantium)
  * @param {Buffer|String} address

index.js

@@ -10,8 +10,8 @@
     "coverage": "npm run build:dist && istanbul cover _mocha",
     "coveralls": "npm run coverage && coveralls <coverage/lcov.info",
     "lint": "standard",
-    "prepublishOnly": "npm run lint && npm run build:dist && npm run test",
-    "test": "npm run test:node && npm run test:browser",
+    "prepublishOnly": "npm run test && npm run build:dist",
+    "test": "npm run lint && npm run test:node && npm run test:browser",
     "test:browser": "npm run build:dist && karma start karma.conf.js",
     "test:node": "npm run build:dist && istanbul test mocha -- --reporter spec",
     "build:dist": "babel index.js --source-root ./ -d ./dist",
@@ -128,7 +128,7 @@
     "karma-firefox-launcher": "^1.0.0",
     "karma-mocha": "^1.3.0",
     "mocha": "^4.0.0",
-    "standard": "*"
+    "standard": "^10.0.0"
   },
   "standard": {
     "globals": [