Merge branch '1.6.0'

.eslintrc.json

@@ -1,6 +1,6 @@
 {
 	"extends": ["lisk-base"],
-	"plugins": ["mocha", "chai-expect"],
+	"plugins": ["chai-expect"],
 	"rules": {
 		"camelcase": "off",
 		"chai-expect/missing-assertion": "error",
@@ -45,11 +45,10 @@
 			"error",
 			{
 				"devDependencies": [
+					"framework/test/**",
 					"test/**",
-					"tasks/**",
-					"scripts/**",
-					"webpack.config.js",
-					"Gruntfile.js"
+					"framework/src/modules/chain/tasks/**",
+					"framework/src/modules/chain/scripts/**"
 				]
 			}
 		],

.gitignore

@@ -19,9 +19,12 @@ docs/jsdoc/
 
 # Logs
 logs/*
+src/logs/
+src/logs.log
+logs.log
 npm-debug.log
 tmux-client-*.log
-test/network/logs/
+framework/test/mocha/network/logs/
 stacktrace*
 
 # IDE directories
@@ -31,12 +34,13 @@ Session.vim
 
 # Config files
 sftp-config.json
-test/network/pm2.network.json
-test/network/configs/
-test/network/networkTestsLogger.logs
+framework/test/mocha/network/pm2.network.json
+framework/test/mocha/network/configs/
+framework/test/mocha/network/networkTestsLogger.logs
 
 # Coverage directory used by tools like istanbul
-test/.coverage-unit/
+.coverage-unit/
+.coverage/
 
 # Local config file useful for development
 config.local.json

.npmignore

@@ -7,12 +7,8 @@ logs/*
 package/
 pids/*
 release/
-scripts/**/*
-!scripts/update_config.js
-!scripts/generate_config.js
 tasks/
 test/
-Grunt*
 Jenkins*
 *.sh
 *.tgz

.nvmrc

@@ -1 +1 @@
-10.14.1
+10.15.3

Dockerfile

@@ -45,5 +45,5 @@ RUN if [ x"$( sha256sum /home/lisk/wait-for-it.sh |awk '{print $1}' )" = x"${WFI
 USER lisk
 WORKDIR /home/lisk/lisk
 
-ENTRYPOINT ["node", "/home/lisk/lisk/app.js"]
+ENTRYPOINT ["node", "/home/lisk/lisk/src/index.js"]
 CMD ["-n", "mainnet"]