From 6157968c5e3405b941ec14d0c3365cbcdf85823a Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Tue, 17 Oct 2017 06:51:52 -0400 Subject: [PATCH 1/2] update default solc version; update spec; fix issue with compiler warnings --- .eslintrc.json | 273 ++++++++++++++++++++++++++++++++ lib/contracts/code_generator.js | 2 - lib/contracts/compiler.js | 9 +- lib/contracts/contracts.js | 2 +- lib/core/config.js | 2 +- lib/core/events.js | 2 +- lib/pipeline/npm.js | 2 +- package.json | 4 +- test_app/config/contracts.json | 2 +- test_app/test/token_spec.js | 2 +- 10 files changed, 286 insertions(+), 14 deletions(-) create mode 100644 .eslintrc.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 000000000..24e8c1a8e --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,273 @@ +{ + "env": { + "browser": true, + "es6": true, + "node": true + }, + "extends": "eslint:recommended", + "parserOptions": { + "sourceType": "module" + }, + "rules": { + "accessor-pairs": "error", + "array-bracket-newline": "error", + "array-bracket-spacing": [ + "error", + "never" + ], + "array-callback-return": "off", + "array-element-newline": "off", + "arrow-body-style": "error", + "arrow-parens": "off", + "arrow-spacing": [ + "error", + { + "after": true, + "before": true + } + ], + "block-scoped-var": "error", + "block-spacing": "error", + "brace-style": "off", + "callback-return": "off", + "camelcase": "off", + "capitalized-comments": "off", + "class-methods-use-this": "off", + "comma-dangle": "error", + "comma-spacing": "off", + "comma-style": [ + "error", + "last" + ], + "complexity": "error", + "computed-property-spacing": [ + "error", + "never" + ], + "consistent-return": "off", + "consistent-this": "off", + "curly": "off", + "default-case": "error", + "dot-location": [ + "error", + "property" + ], + "dot-notation": "off", + "eol-last": "error", + "eqeqeq": "off", + "for-direction": "error", + "func-call-spacing": "error", + "func-name-matching": "error", + "func-names": "off", + "func-style": "off", + "function-paren-newline": "off", + "generator-star-spacing": "error", + "getter-return": "error", + "global-require": "off", + "guard-for-in": "off", + "handle-callback-err": "off", + "id-blacklist": "error", + "id-length": "off", + "id-match": "error", + "indent": "off", + "indent-legacy": "off", + "init-declarations": "off", + "jsx-quotes": "error", + "key-spacing": "off", + "keyword-spacing": "off", + "line-comment-position": "off", + "linebreak-style": [ + "error", + "unix" + ], + "lines-around-comment": "error", + "lines-around-directive": "error", + "max-depth": "error", + "max-len": "off", + "max-lines": "off", + "max-nested-callbacks": "error", + "max-params": "off", + "max-statements": "off", + "max-statements-per-line": "error", + "multiline-ternary": [ + "error", + "never" + ], + "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": "error", + "no-bitwise": "error", + "no-buffer-constructor": "error", + "no-caller": "error", + "no-catch-shadow": "error", + "no-confusing-arrow": "error", + "no-console": "off", + "no-continue": "off", + "no-div-regex": "error", + "no-duplicate-imports": "error", + "no-else-return": "off", + "no-empty-function": "off", + "no-eq-null": "error", + "no-eval": "off", + "no-extend-native": "error", + "no-extra-bind": "error", + "no-extra-label": "error", + "no-extra-parens": "off", + "no-floating-decimal": "error", + "no-implicit-coercion": "error", + "no-implicit-globals": "error", + "no-implied-eval": "error", + "no-inline-comments": "off", + "no-inner-declarations": [ + "error", + "functions" + ], + "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": "error", + "no-magic-numbers": "off", + "no-mixed-operators": "error", + "no-mixed-requires": "error", + "no-multi-assign": "error", + "no-multi-spaces": "off", + "no-multi-str": "error", + "no-multiple-empty-lines": "error", + "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": "error", + "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": "error", + "no-return-await": "error", + "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": "off", + "no-undef-init": "error", + "no-undefined": "off", + "no-underscore-dangle": "off", + "no-unmodified-loop-condition": "error", + "no-unneeded-ternary": "error", + "no-unused-expressions": "error", + "no-unused-vars": ["error", { "argsIgnorePattern": "^_" }], + "no-use-before-define": "off", + "no-useless-call": "off", + "no-useless-computed-key": "error", + "no-useless-concat": "error", + "no-useless-constructor": "error", + "no-useless-rename": "error", + "no-useless-return": "off", + "no-var": "off", + "no-void": "error", + "no-warning-comments": "off", + "no-whitespace-before-property": "error", + "no-with": "error", + "nonblock-statement-body-position": "error", + "object-curly-newline": "off", + "object-curly-spacing": [ + "error", + "never" + ], + "object-property-newline": "off", + "object-shorthand": "off", + "one-var": "off", + "one-var-declaration-per-line": "off", + "operator-assignment": "off", + "operator-linebreak": "error", + "padded-blocks": "off", + "padding-line-between-statements": "error", + "prefer-arrow-callback": "off", + "prefer-const": "off", + "prefer-destructuring": "off", + "prefer-numeric-literals": "error", + "prefer-promise-reject-errors": "error", + "prefer-reflect": "off", + "prefer-rest-params": "off", + "prefer-spread": "off", + "prefer-template": "off", + "quote-props": "off", + "quotes": "off", + "radix": "error", + "require-await": "error", + "require-jsdoc": "off", + "rest-spread-spacing": "error", + "semi": "error", + "semi-spacing": [ + "error", + { + "after": true, + "before": false + } + ], + "semi-style": [ + "error", + "last" + ], + "sort-imports": "error", + "sort-keys": "off", + "sort-vars": "off", + "space-before-blocks": "off", + "space-before-function-paren": "off", + "space-in-parens": [ + "error", + "never" + ], + "space-infix-ops": "off", + "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": "error", + "vars-on-top": "off", + "wrap-iife": "error", + "wrap-regex": "error", + "yield-star-spacing": "error", + "yoda": [ + "error", + "never" + ] + } +} diff --git a/lib/contracts/code_generator.js b/lib/contracts/code_generator.js index f1dee3548..ac973eb42 100644 --- a/lib/contracts/code_generator.js +++ b/lib/contracts/code_generator.js @@ -104,8 +104,6 @@ class CodeGenerator { let contractsPlugins; if (useLoader === false) { - let result; - for (let className in this.contractsManager.contracts) { let contract = this.contractsManager.contracts[className]; let abi = JSON.stringify(contract.abiDefinition); diff --git a/lib/contracts/compiler.js b/lib/contracts/compiler.js index f0a1662a0..450067da0 100644 --- a/lib/contracts/compiler.js +++ b/lib/contracts/compiler.js @@ -83,11 +83,12 @@ class Compiler { self.logger.info("compiling contracts..."); solcW.compile({sources: input}, 1, function (output) { if (output.errors) { - if (output.errors.length === 1 && output.errors[0].indexOf('Warning:') >= 0) { - self.logger.warn(output.errors[0]); - } else { - return callback(new Error("Solidity errors: " + output.errors).message); + for (let i=0; i= 0) { + return callback(new Error("Solidity errors: " + output.errors).message); + } } + self.logger.warn(output.errors.join('\n')); } callback(null, output); }); diff --git a/lib/contracts/contracts.js b/lib/contracts/contracts.js index 2c73c6936..b426ced9d 100644 --- a/lib/contracts/contracts.js +++ b/lib/contracts/contracts.js @@ -13,7 +13,7 @@ class ContractsManager { this.logger = options.logger; this.plugins = options.plugins; if (!options.contractsConfig.versions) { - this.solcVersion = "0.4.11"; + this.solcVersion = "0.4.17"; } else { this.solcVersion = options.contractsConfig.versions.solc; } diff --git a/lib/core/config.js b/lib/core/config.js index 9bc599f43..a4a4f3d3d 100644 --- a/lib/core/config.js +++ b/lib/core/config.js @@ -79,7 +79,7 @@ Config.prototype.loadContractsConfigFile = function() { var configObject = { "versions": { "web3.js": "0.19.1", - "solc": "0.4.11" + "solc": "0.4.17" }, "deployment": { "host": "localhost", diff --git a/lib/core/events.js b/lib/core/events.js index b921e48f8..425574e91 100644 --- a/lib/core/events.js +++ b/lib/core/events.js @@ -3,7 +3,7 @@ var EventEmitter = require('events'); function warnIfLegacy(eventName) { const legacyEvents = ['abi-vanila', 'abi', 'abi-contracts-vanila', 'abi-vanila-deployment']; if (legacyEvents.indexOf(eventName) >= 0) { - console.warn("this event is deprecated and will be removed in future versions: " + eventName); + console.info("this event is deprecated and will be removed in future versions: " + eventName); } } diff --git a/lib/pipeline/npm.js b/lib/pipeline/npm.js index 275fd804a..5a393acee 100644 --- a/lib/pipeline/npm.js +++ b/lib/pipeline/npm.js @@ -1,3 +1,4 @@ +// TODO: this is horrible and needs to be refactored ASAP let utils = require('../utils/utils.js'); let fs = require('../core/fs.js'); let o_fs = require('fs-extra'); @@ -26,7 +27,6 @@ class Npm { res.on('end', function () { let registryJSON = JSON.parse(body); - console.log(JSON.stringify(registryJSON)); let tarball = registryJSON.dist.tarball; var download = function(url, dest, cb) { diff --git a/package.json b/package.json index ef16a2452..c51cfcf99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "embark", - "version": "2.5.2", + "version": "2.6.0", "description": "Embark is a framework that allows you to easily develop and deploy DApps", "scripts": { "test": "grunt jshint && mocha test/ --no-timeouts" @@ -33,7 +33,7 @@ "promptly": "^2.1.0", "serve-static": "^1.11.1", "shelljs": "^0.5.0", - "solc": "0.4.11", + "solc": "0.4.17", "tar": "^3.1.5", "toposort": "^1.0.0", "underscore": "^1.8.3", diff --git a/test_app/config/contracts.json b/test_app/config/contracts.json index ce0de3ce5..d2a7e2b34 100644 --- a/test_app/config/contracts.json +++ b/test_app/config/contracts.json @@ -2,7 +2,7 @@ "default": { "versions": { "web3.js": "1.0.0-beta", - "solc": "0.4.11" + "solc": "0.4.17" }, "deployment": { "host": "localhost", diff --git a/test_app/test/token_spec.js b/test_app/test/token_spec.js index 4b718f593..d24dbe587 100644 --- a/test_app/test/token_spec.js +++ b/test_app/test/token_spec.js @@ -28,7 +28,7 @@ describe("Token", function() { }); it("not deploy Token", function(done) { - assert.equal(Token.address, "undefined"); + assert.equal(Token.address, ""); done(); }); From 460f78cc553d50a549876fc06ec4fd738b741d43 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Tue, 17 Oct 2017 07:03:13 -0400 Subject: [PATCH 2/2] update events name for code generation --- lib/contracts/code_generator.js | 34 ++++++++++++++++++++++++++++++++- lib/core/engine.js | 2 +- lib/core/test.js | 13 +------------ lib/index.js | 2 +- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/lib/contracts/code_generator.js b/lib/contracts/code_generator.js index ac973eb42..54850098e 100644 --- a/lib/contracts/code_generator.js +++ b/lib/contracts/code_generator.js @@ -11,7 +11,7 @@ const Templates = { web3_connector: require('./code_templates/web3-connector.js.ejs'), do_when_loaded: require('./code_templates/do-when-loaded.js.ejs'), exec_when_env_loaded: require('./code_templates/exec-when-env-loaded.js.ejs') -} +}; class CodeGenerator { constructor(options) { @@ -27,6 +27,7 @@ class CodeGenerator { listenToCommands() { let self = this; + // deprecated events; to remove in embark 2.7.0 this.events.setCommandHandler('abi-vanila', function(cb) { let vanillaABI = self.generateABI({useEmbarkJS: false}); let contractsJSON = self.generateContractsJSON(); @@ -54,6 +55,37 @@ class CodeGenerator { cb(vanillaABI, contractsJSON); }); + + // new events + this.events.setCommandHandler('code-vanila', function(cb) { + let vanillaABI = self.generateABI({useEmbarkJS: false}); + let contractsJSON = self.generateContractsJSON(); + + cb(vanillaABI, contractsJSON); + }); + + this.events.setCommandHandler('code', function(cb) { + let embarkJSABI = self.generateABI({useEmbarkJS: true}); + let contractsJSON = self.generateContractsJSON(); + + cb(embarkJSABI, contractsJSON); + }); + + this.events.setCommandHandler('code-contracts-vanila', function(cb) { + let vanillaContractsABI = self.generateContracts(false, true, false); + let contractsJSON = self.generateContractsJSON(); + + cb(vanillaContractsABI, contractsJSON); + }); + + this.events.setCommandHandler('code-vanila-deployment', function(cb) { + let vanillaABI = self.generateABI({useEmbarkJS: false, deployment: true}); + let contractsJSON = self.generateContractsJSON(); + + cb(vanillaABI, contractsJSON); + }); + + } generateProvider(isDeployment) { diff --git a/lib/core/engine.js b/lib/core/engine.js index 181b129d3..04bc17297 100644 --- a/lib/core/engine.js +++ b/lib/core/engine.js @@ -81,7 +81,7 @@ class Engine { plugins: this.plugins }); this.events.on('code-generator-ready', function () { - self.events.request('abi', function (abi, contractsJSON) { + self.events.request('code', function (abi, contractsJSON) { self.currentAbi = abi; self.contractsJSON = contractsJSON; pipeline.build(abi, contractsJSON, null, function() { diff --git a/lib/core/test.js b/lib/core/test.js index 949348658..6173f87be 100644 --- a/lib/core/test.js +++ b/lib/core/test.js @@ -71,21 +71,10 @@ Test.prototype.deployAll = function(contractsConfig, cb) { callback(); }, function deploy(callback) { - //self.engine.events.setHandler('abi-contracts-vanila', function(vanillaABI) { - //elf.engine.events.on('abi-contracts-vanila', function(vanillaABI) { self.engine.events.on('code-generator-ready', function () { - self.engine.events.request('abi-contracts-vanila', function(vanillaABI) { - console.log("got abi-contracts-vanila request"); + self.engine.events.request('code-contracts-vanila', function(vanillaABI) { callback(null, vanillaABI); }); - //self.engine.events.on('abi-contracts-vanila', function(vanillaABI) { - // console.log("got abi-contracts-vanila"); - // callback(null, vanillaABI); - //}); - //self.engine.events.request('abi', function(vanillaABI) { - // console.log("got abi"); - // callback(null, vanillaABI); - //}); }); self.engine.deployManager.deployContracts(function(err, result) { diff --git a/lib/index.js b/lib/index.js index 88498f09d..c0ca02ad7 100644 --- a/lib/index.js +++ b/lib/index.js @@ -81,7 +81,7 @@ class Embark { }); dashboard.start(function () { engine.events.on('code-generator-ready', function () { - engine.events.request('abi-vanila-deployment', function (abi) { + engine.events.request('code-vanila-deployment', function (abi) { dashboard.console.runCode(abi); }); });