diff --git a/.eslintrc.json b/.eslintrc.json index bfa7ebf..4ba25f8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,37 +1,317 @@ { - "parser": "babel-eslint", "env": { "browser": true, "es6": true, "node": true }, + "extends": "eslint:recommended", "parserOptions": { + "ecmaVersion": 2018, "sourceType": "module" }, "rules": { + "accessor-pairs": "error", + "array-bracket-newline": "off", + "array-bracket-spacing": [ + "error", + "never" + ], + "array-callback-return": "off", + "array-element-newline": "off", + "arrow-body-style": "off", + "arrow-parens": "off", + "arrow-spacing": [ + "error", + { + "after": true, + "before": true + } + ], + "block-scoped-var": "error", + "block-spacing": "error", + "brace-style": [ + "error", + "1tbs" + ], + "callback-return": "error", + "capitalized-comments": "off", + "class-methods-use-this": "off", + "comma-dangle": "off", + "comma-spacing": [ + "error", + { + "after": true, + "before": false + } + ], + "comma-style": [ + "error", + "last" + ], + "complexity": "off", + "computed-property-spacing": [ + "error", + "never" + ], + "consistent-return": "off", + "consistent-this": "off", + "curly": "off", + "default-case": "off", + "dot-location": [ + "error", + "property" + ], + "dot-notation": "off", + "eol-last": "off", + "eqeqeq": "off", + "func-call-spacing": "error", + "func-name-matching": "off", + "func-names": "off", + "func-style": "off", + "function-paren-newline": "off", + "generator-star-spacing": "error", + "global-require": "off", + "guard-for-in": "off", + "handle-callback-err": "error", + "id-blacklist": "error", + "id-length": "off", + "id-match": "error", + "implicit-arrow-linebreak": "off", "indent": [ "error", - 4, { - "MemberExpression": "off", + 4, + { + "MemberExpression": "off", "SwitchCase": 1 } ], + "indent-legacy": "off", + "init-declarations": "off", + "jsx-quotes": "error", + "key-spacing": "error", + "keyword-spacing": "off", + "line-comment-position": "off", "linebreak-style": [ "error", "unix" ], - "quotes": [ + "lines-around-comment": "off", + "lines-around-directive": "error", + "lines-between-class-members": "off", + "max-classes-per-file": "off", + "max-depth": "error", + "max-len": "off", + "max-lines": "off", + "max-lines-per-function": "off", + "max-nested-callbacks": "error", + "max-params": "off", + "max-statements": "off", + "max-statements-per-line": "error", + "multiline-comment-style": "off", + "multiline-ternary": [ "error", - "single" + "always-multiline" ], - "semi": [ + "new-parens": "off", + "newline-after-var": "off", + "newline-before-return": "off", + "newline-per-chained-call": "off", + "no-alert": "error", + "no-array-constructor": "error", + "no-await-in-loop": "off", + "no-bitwise": "off", + "no-buffer-constructor": "off", + "no-caller": "error", + "no-catch-shadow": "error", + "no-case-declarations": "off", + "no-confusing-arrow": "off", + "no-constant-condition": [ "error", - "always" + { + "checkLoops": false + } ], "no-console": "off", - "no-unused-vars": "error", - "curly": ["error", "multi-or-nest"], + "no-continue": "off", + "no-div-regex": "error", + "no-duplicate-imports": "off", + "no-else-return": "off", + "no-empty": [ + "error", + { + "allowEmptyCatch": true + } + ], + "no-empty-function": "off", + "no-eq-null": "error", + "no-eval": "error", + "no-extend-native": "error", + "no-extra-bind": "error", + "no-extra-label": "error", + "no-extra-parens": "off", + "no-floating-decimal": "error", + "no-implicit-globals": "error", + "no-implied-eval": "error", + "no-inline-comments": "off", + "no-invalid-this": "off", + "no-iterator": "error", + "no-label-var": "error", + "no-labels": "error", + "no-lone-blocks": "error", + "no-lonely-if": "off", + "no-loop-func": "off", + "no-magic-numbers": "off", + "no-mixed-operators": "off", + "no-mixed-requires": "error", + "no-multi-assign": "error", + "no-multi-spaces": "error", + "no-multi-str": "error", + "no-multiple-empty-lines": "off", + "no-native-reassign": "error", + "no-negated-condition": "off", + "no-negated-in-lhs": "error", + "no-nested-ternary": "error", + "no-new": "error", + "no-new-func": "error", + "no-new-object": "error", + "no-new-require": "error", + "no-new-wrappers": "error", + "no-octal-escape": "error", + "no-param-reassign": "off", + "no-path-concat": "error", + "no-plusplus": "off", + "no-process-env": "off", + "no-process-exit": "off", + "no-proto": "off", + "no-prototype-builtins": "off", + "no-restricted-globals": "error", + "no-restricted-imports": "error", + "no-restricted-modules": "error", + "no-restricted-properties": "error", + "no-restricted-syntax": "error", + "no-return-assign": "off", + "no-return-await": "off", + "no-script-url": "error", + "no-self-compare": "error", + "no-sequences": "error", + "no-shadow": "off", + "no-shadow-restricted-names": "error", + "no-spaced-func": "error", + "no-sync": "off", + "no-tabs": "error", + "no-template-curly-in-string": "error", + "no-ternary": "off", + "no-throw-literal": "error", + "no-trailing-spaces": [ + "error", + { + "ignoreComments": true, + "skipBlankLines": true + } + ], + "no-undef-init": "error", + "no-undefined": "off", + "no-underscore-dangle": "off", + "no-unmodified-loop-condition": "error", + "no-unneeded-ternary": "off", + "no-unused-expressions": "off", + "no-use-before-define": "off", + "no-useless-call": "error", + "no-useless-computed-key": "error", + "no-useless-concat": "off", + "no-useless-constructor": "error", + "no-useless-return": "off", "no-var": "error", - "no-throw-literal": "error" + "no-void": "error", + "no-warning-comments": "off", + "no-whitespace-before-property": "error", + "no-with": "error", + "nonblock-statement-body-position": [ + "error", + "any" + ], + "object-curly-newline": "off", + "object-curly-spacing": [ + "error", + "always" + ], + "object-property-newline": "error", + "object-shorthand": "off", + "one-var": "off", + "one-var-declaration-per-line": [ + "error", + "initializations" + ], + "operator-assignment": "off", + "operator-linebreak": [ + "error", + "after" + ], + "padded-blocks": "off", + "padding-line-between-statements": "error", + "prefer-arrow-callback": "off", + "prefer-const": "error", + "prefer-destructuring": "off", + "prefer-numeric-literals": "error", + "prefer-object-spread": "off", + "prefer-promise-reject-errors": "error", + "prefer-reflect": "off", + "prefer-rest-params": "off", + "prefer-spread": "off", + "prefer-template": "off", + "quote-props": "off", + "quotes": [ + "error", + "single" + ], + "radix": "off", + "require-await": "off", + "require-jsdoc": "off", + "rest-spread-spacing": [ + "error", + "never" + ], + "semi": "error", + "semi-spacing": [ + "error", + { + "after": true, + "before": false + } + ], + "semi-style": [ + "error", + "last" + ], + "sort-imports": "off", + "sort-keys": "off", + "sort-vars": "off", + "space-before-blocks": "error", + "space-before-function-paren": "off", + "space-in-parens": [ + "error", + "never" + ], + "space-infix-ops": "error", + "space-unary-ops": "error", + "spaced-comment": "off", + "strict": "error", + "switch-colon-spacing": "error", + "symbol-description": "error", + "template-curly-spacing": [ + "error", + "never" + ], + "template-tag-spacing": "error", + "unicode-bom": [ + "error", + "never" + ], + "valid-jsdoc": "off", + "vars-on-top": "error", + "wrap-iife": "error", + "wrap-regex": "off", + "yield-star-spacing": "error", + "yoda": "off" } -} +} \ No newline at end of file diff --git a/config/karma.conf.js b/config/karma.conf.js index cbe6237..e43ab10 100644 --- a/config/karma.conf.js +++ b/config/karma.conf.js @@ -20,7 +20,7 @@ const configuration = { enabled: true, usePhantomJS: false, postDetection: function(availableBrowser) { - return ['Firefox']; // comment in to test specific browser + // return ['Firefox']; // comment in to test specific browser const browsers = availableBrowser .filter(b => !['PhantomJS', 'FirefoxAurora', 'FirefoxNightly'].includes(b)) .map(b => { diff --git a/package.json b/package.json index 79ed0db..4e12588 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "async-test-util": "1.7.3", "babel-cli": "6.26.0", "babel-core": "6.26.3", - "babel-eslint": "10.0.1", "babel-loader": "8.0.6", "babel-plugin-transform-async-to-generator": "6.24.1", "babel-plugin-transform-class-properties": "6.24.1", diff --git a/src/public-key.js b/src/public-key.js index a4f1b9a..22d709d 100644 --- a/src/public-key.js +++ b/src/public-key.js @@ -17,7 +17,7 @@ export function compress(startsWith04) { new Buffer(startsWith04, 'hex'), true ).toString('hex'); -}; +} export function decompress(startsWith02Or03) { @@ -33,7 +33,7 @@ export function decompress(startsWith02Or03) { // remove trailing 04 decompressed = decompressed.substring(2); return decompressed; -}; +} /** * generates the ethereum-adress of the publicKey diff --git a/src/recover-public-key.js b/src/recover-public-key.js index 04b1893..4db0261 100644 --- a/src/recover-public-key.js +++ b/src/recover-public-key.js @@ -16,7 +16,7 @@ export default function recoverPublicKey(signature, hash) { signature = removeTrailing0x(signature); // split into v-value and sig - const sigOnly = signature.substring(0, signature.length - 2); // all but last 2 chars + const sigOnly = signature.substring(0, signature.length - 2); // all but last 2 chars const vValue = signature.slice(-2); // last 2 chars const recoveryNumber = vValue === '1c' ? 1 : 0; diff --git a/test/.eslintrc b/test/.eslintrc new file mode 100644 index 0000000..cc36e1e --- /dev/null +++ b/test/.eslintrc @@ -0,0 +1,3 @@ +env: + node: true + mocha: true \ No newline at end of file diff --git a/test/integration.test.js b/test/integration.test.js index ff2199b..993cbe6 100644 --- a/test/integration.test.js +++ b/test/integration.test.js @@ -5,7 +5,7 @@ const AsyncTestUtil = require('async-test-util'); const SolidityCli = require('solidity-cli'); const assert = require('assert'); const EthCrypto = require('../dist/lib/index'); -const web3 = EthCrypto.util.web3; +// const web3 = EthCrypto.util.web3; describe('integration.test.js', () => { const state = { @@ -161,7 +161,7 @@ describe('integration.test.js', () => { }); describe('.prefixedHash()', () => { return; // TODO - it('should create the same hash as web3.accounts.sign()', async () => { + /* it('should create the same hash as web3.accounts.sign()', async () => { const ident = EthCrypto.createIdentity(); const str = 'foobar'; const hash = EthCrypto.hash.keccak256([{ @@ -204,7 +204,7 @@ describe('integration.test.js', () => { .call(); console.log('= solHash: ' + solHash); assert.equal(jsHash, solHash); - }); + });*/ }); }); describe('sign', () => { diff --git a/test/unit.test.js b/test/unit.test.js index cadcebd..7ecd4f5 100644 --- a/test/unit.test.js +++ b/test/unit.test.js @@ -95,7 +95,6 @@ describe('unit.test.js', () => { }); describe('negative', () => { it('should not sign with wrong key', () => { - return; // TODO assert.throws( () => EthCrypto.sign( 'XXX' + AsyncTestUtil.randomString(222),