diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000..24e8c1a8 --- /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/.gitignore b/.gitignore index 162b9c4d..0c56f1e4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ test_app/.embark/development/ test_app/config/production/password test_app/node_modules/ test_app/chains.json -.idea \ No newline at end of file +.idea +.eslintrc.json diff --git a/README.md b/README.md index f6ff10ab..fc8268e8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -[![npm](https://img.shields.io/npm/dm/embark.svg)]() -[![Gitter](https://img.shields.io/gitter/room/iurimatias/embark-framework.svg)]() +![Embark](https://github.com/iurimatias/embark-framework/raw/develop/logo.png) + +[![npm](https://img.shields.io/npm/dm/embark.svg)](https://npmjs.com/package/embark) +[![Gitter](https://img.shields.io/gitter/room/iurimatias/embark-framework.svg)](https://gitter.im/iurimatias/embark-framework) [![Build Status](https://travis-ci.org/iurimatias/embark-framework.svg?branch=develop)](https://travis-ci.org/iurimatias/embark-framework) [![Code Climate](https://codeclimate.com/github/iurimatias/embark-framework/badges/gpa.svg)](https://codeclimate.com/github/iurimatias/embark-framework) @@ -55,7 +57,7 @@ Table of Contents Installation ====== -Requirements: geth (1.5.8 or higher), node (6.9.1 or higher is recommended) and npm +Requirements: geth (1.6.5 or higher recommended, 1.6.0 or lower for whisper v1 support; whisper v5 support coming soon), node (6.9.1 or higher is recommended) and npm Optional: testrpc (3.0 or higher) if using the simulator or the test functionality. Further: depending on the dapp stack you choose: [IPFS](https://ipfs.io/) @@ -389,7 +391,7 @@ EmbarkJS - Communication **initialization** -For Whisper: +For Whisper (note: currently requires geth 1.6.0): ```Javascript EmbarkJS.Messages.setProvider('whisper') @@ -549,4 +551,4 @@ For more information on how to develop your own plugin, please see the [plugin d Donations ====== -If you like Embark, please consider donating to 0x8811FdF0F988f0CD1B7E9DE252ABfA5b18c1cDb1 +If you like Embark, please consider donating to 0xFA239D14c7117C3D2370B2a4c4238534391fadd9 diff --git a/boilerplate/config/blockchain.json b/boilerplate/config/blockchain.json index 3453a87d..26c14fcc 100644 --- a/boilerplate/config/blockchain.json +++ b/boilerplate/config/blockchain.json @@ -12,7 +12,8 @@ "rpcCorsDomain": "http://localhost:8000", "account": { "password": "config/development/password" - } + }, + "wsOrigins": "http://localhost:8000" }, "testnet": { "enabled": true, diff --git a/boilerplate/config/communication.json b/boilerplate/config/communication.json index 07c7851a..80ec2f80 100644 --- a/boilerplate/config/communication.json +++ b/boilerplate/config/communication.json @@ -2,6 +2,11 @@ "default": { "enabled": true, "provider": "whisper", - "available_providers": ["whisper", "orbit"] + "available_providers": ["whisper", "orbit"], + "connection": { + "host": "localhost", + "port": 8546, + "type": "ws" + } } } diff --git a/boilerplate/config/contracts.json b/boilerplate/config/contracts.json index f9bbf576..41db174d 100644 --- a/boilerplate/config/contracts.json +++ b/boilerplate/config/contracts.json @@ -1,5 +1,18 @@ { "default": { + "versions": { + "web3.js": "1.0.0-beta", + "solc": "0.4.17" + }, + "deployment": { + "host": "localhost", + "port": 8545, + "type": "rpc" + }, + "dappConnection": [ + "$WEB3", + "http://localhost:8545" + ], "gas": "auto", "contracts": { } diff --git a/boilerplate/config/development/genesis.json b/boilerplate/config/development/genesis.json index 9f2d1562..4a50a438 100644 --- a/boilerplate/config/development/genesis.json +++ b/boilerplate/config/development/genesis.json @@ -1,4 +1,7 @@ { + "config": { + "homesteadBlock": 1 + }, "nonce": "0x0000000000000042", "difficulty": "0x0", "alloc": { diff --git a/boilerplate/config/storage.json b/boilerplate/config/storage.json index f9516470..f1041e84 100644 --- a/boilerplate/config/storage.json +++ b/boilerplate/config/storage.json @@ -11,6 +11,7 @@ "enabled": true, "provider": "ipfs", "host": "localhost", - "port": 5001 + "port": 5001, + "getUrl": "http://localhost:8080/ipfs/" } } diff --git a/boilerplate/package.json b/boilerplate/package.json index a1ab4c7f..46a57488 100644 --- a/boilerplate/package.json +++ b/boilerplate/package.json @@ -9,7 +9,5 @@ "license": "ISC", "homepage": "", "devDependencies": { - "embark": "^2.4.3", - "mocha": "^2.2.5" } } diff --git a/boilerplate/test/contract_spec.js b/boilerplate/test/contract_spec.js index e0a6a9dc..d2a8be47 100644 --- a/boilerplate/test/contract_spec.js +++ b/boilerplate/test/contract_spec.js @@ -1,7 +1,3 @@ -var assert = require('assert'); -var EmbarkSpec = require('embark/lib/core/test.js'); - - // describe("SimpleStorage", function() { // before(function(done) { // this.timeout(0); @@ -29,4 +25,4 @@ var EmbarkSpec = require('embark/lib/core/test.js'); // }); // }); // -// }); \ No newline at end of file +// }); diff --git a/demo/app/contracts/simple_storage.sol b/demo/app/contracts/simple_storage.sol index 13957b2d..955ad899 100644 --- a/demo/app/contracts/simple_storage.sol +++ b/demo/app/contracts/simple_storage.sol @@ -2,15 +2,15 @@ pragma solidity ^0.4.7; contract SimpleStorage { uint public storedData; - function SimpleStorage(uint initialValue) { + function SimpleStorage(uint initialValue) public { storedData = initialValue; } - function set(uint x) { + function set(uint x) public { storedData = x; } - function get() constant returns (uint retVal) { + function get() public view returns (uint retVal) { return storedData; } diff --git a/demo/app/index.html b/demo/app/index.html index 9dcde044..10b27f23 100644 --- a/demo/app/index.html +++ b/demo/app/index.html @@ -77,6 +77,7 @@