ethereumjs · Dec 4, 2017 · Dec 5, 2017 · Dec 9, 2017 · Dec 15, 2017 · Dec 21, 2017
Showing with 49 additions and 28 deletions.

+21 −0 .eslintrc.js

+2 −0 .gitignore

+11 −13 .travis.yml

+4 −5 index.js

+10 −9 package.json

+1 −1 test/index.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,21 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": [
+            "error",
+            2
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+    }
+};
diff --git a/.gitignore b/.gitignore
@@ -64,3 +64,5 @@ build/Release
 node_modules
 package-lock.json
 
+#webstorm
+.idea
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,24 @@
 language: node_js
 node_js:
-  - "6"
-  - "7"
-  - "8"
+- '6'
+- '7'
+- '8'
 env:
-  - CXX=g++-4.8
+  matrix:
+  - CXX=g++-4.8 TEST_SUITE=test
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
     packages:
     - g++-4.8
-env:
-  matrix:
-    - CXX=g++-4.8 TEST_SUITE=test
 matrix:
   fast_finish: true
   include:
-    - os: linux
-      node_js: "6"
-      env: CXX=g++-4.8 TEST_SUITE=coveralls
-    - os: linux
-      node_js: "6"
-      env: CXX=g++-4.8 TEST_SUITE=lint
+  - os: linux
+    node_js: '6'
+    env: CXX=g++-4.8 TEST_SUITE=lint
 script: npm run $TEST_SUITE
+notifications:
+  slack:
+    secure: kKDJh+WyIBJWUClPoKeeJFwBSayH8kbAszF44GP/Eoqspzfhb+ekGFhF0MxRvLjsG3YcDwIDS5TQK42jm3uJj00vfyzfGd/rIn/4kFX8BTSLJwoOqzAZHwTF3UIxwL7bqZMYZ60mpKe0HA06tEp31MYkTmOpDCJ3HTuT+WpYbGcq8AaSGJmQ2tR44ueTef+1pvrwO0X0nWw1K/Xe8k0dxqKNXVgjJnNLvQm5VC1oEPyIo/TQEGCv4UEwsRviFUz7BtXXWMWTCGXEIz4i0J+swOXT7ts4jreBFpYGEFv0UzQ6Q3l84dJ3tTKPAsa0rqv9a673PRIXKHAbq9DdSJEKyQ8GqG7mVn6qR2VQcJFA9sWwQ3Nl8USnyiHgzO5iJAeQLsl02wsx8D/2zwQeX7ZjcRqdcyDtOS05vRSyHqbLnulCR07OohWC5hSOvQyJPOuNVgVRi+3KGgypvWMc5khxs2INFkhBi7zEPT8ZoLkSGqKFnHE9TM7cjlJHY0m/uCIQa/2GZK1UCXrbCHDPdH+k1L0joSnEdHi8NoBnFSu1kaNXWb2dUWo6kEk15r5BuYBfO1QXrztatOJSbEI9bjkuowqAdVNJSXxFxJGN87YLwDqzZMoDMp0bChrIBXLCSOs8kpSB/BashTXThTK8CTqqXuOlnAs1+Hm8IkE0v5OVbCw=
diff --git a/index.js b/index.js
@@ -1,4 +1,4 @@
-const ethUtil = require('ethereumjs-util')
+const ethUtil = require('@shyftnetwork/shyft_ethereumjs-util')
 const rlp = require('rlp')
 const Buffer = require('safe-buffer').Buffer
 
@@ -19,7 +19,6 @@ var Account = module.exports = function (data) {
     length: 32,
     default: ethUtil.SHA3_NULL
   }]
-
   ethUtil.defineProperties(this, fields, data)
 }
 
@@ -74,7 +73,7 @@ Account.prototype.setStorage = function (trie, key, val, cb) {
 
 Account.prototype.isEmpty = function () {
   return this.balance.toString('hex') === '' &&
-  this.nonce.toString('hex') === '' &&
-  this.stateRoot.toString('hex') === ethUtil.SHA3_RLP_S &&
-  this.codeHash.toString('hex') === ethUtil.SHA3_NULL_S
+        this.nonce.toString('hex') === '' &&
+        this.stateRoot.toString('hex') === ethUtil.SHA3_RLP_S &&
+        this.codeHash.toString('hex') === ethUtil.SHA3_NULL_S
 }
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "ethereumjs-account",
-  "version": "2.0.3",
+  "name": "@shyftnetwork/shyft_ethereumjs-account",
+  "version": "2.0.5",
   "description": "Encoding, decoding and validation of Ethereum's Account schema",
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ethereumjs/ethereumjs-account.git"
+    "url": "git+https://github.com/shyftnetwork/shyft_ethereumjs-account.git"
   },
   "scripts": {
     "coverage": "istanbul cover ./test/index.js",
@@ -17,21 +17,22 @@
     "ethereum",
     "account"
   ],
-  "author": "mjbecze (mjbecze@gmail.com)",
+  "author": "cf (chris@shyft.network)",
   "license": "MPL-2.0",
   "bugs": {
-    "url": "https://github.com/ethereumjs/ethereumjs-account/issues"
+    "url": "https://github.com/shyftnetwork/shyft_ethereumjs-account/issues"
   },
-  "homepage": "https://github.com/ethereumjs/ethereumjs-account#readme",
+  "homepage": "https://github.com/shyftnetwork/shyft_ethereumjs-account#readme",
   "dependencies": {
-    "ethereumjs-util": "^5.0.0",
+    "@shyftnetwork/shyft_ethereumjs-util": "^5.0.0",
     "rlp": "^2.0.0",
-    "safe-buffer": "^5.1.1"
+    "safe-buffer": "^5.1.1",
+    "standard": "^11.0.1"
   },
   "devDependencies": {
     "coveralls": "^2.11.4",
+    "eslint": "^4.12.1",
     "istanbul": "^0.4.1",
-    "standard": "^10.0.0",
     "tape": "^4.0.3"
   }
 }
diff --git a/test/index.js b/test/index.js
@@ -20,7 +20,7 @@ tape('constructor with Array', function (tester) {
       '0x02', // nonce
       '0x0384', // balance
       '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421', // stateRoot
-      '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470'  // codeHash
+      '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470' // codeHash
     ]
     var account = new Account(raw)
     t.equal(account.nonce.toString('hex'), '02')