upgrade to Lisk 0.8.0 codebase

.travis.yml

@@ -1,7 +1,7 @@
 dist: 'trusty'
 language: node_js
 node_js:
-  - '6.9.5'
+  - '6.10.1'
 cache:
   directories:
     - test/lisk-js
@@ -28,8 +28,10 @@ env:
     - HOST=http://0.0.0.0:4000
     - COVERALLS_PARALLEL=true
   matrix:
+    # Longest duration first
     - TEST=test/api/peer.transactions.stress.js TEST_TYPE='FUNC'
     - TEST=test/api/peer.transactions.votes.js TEST_TYPE='FUNC'
+    - TEST=test/unit/logic TEST_TYPE='UNIT'
     - TEST=test/api/delegates.js TEST_TYPE='FUNC'
     - TEST=test/api/accounts.js TEST_TYPE='FUNC'
     - TEST=test/api/blocks.js TEST_TYPE='FUNC'
@@ -49,11 +51,9 @@ env:
     - TEST=test/api/transactions.js TEST_TYPE='FUNC'
 
     - TEST=test/unit/helpers TEST_TYPE='UNIT'
-    - TEST=test/unit/logic TEST_TYPE='UNIT'
     - TEST=test/unit/modules TEST_TYPE='UNIT'
 script: 'npm run travis'
 after_success:
     - bash .travis/after-success.sh $TRAVIS_BUILD_NUMBER ${TRAVIS_JOB_NUMBER#*.} $TEST_TYPE $TRAVIS_BUILD_DIR $TRAVIS_BRANCH $TRAVIS_PULL_REQUEST_BRANCH;
 after_failure:
   - cat .app.log
-

Gruntfile.js

@@ -6,6 +6,7 @@ var util = require('util');
 module.exports = function (grunt) {
 	var files = [
 		'logger.js',
+		'api/**/*.js',
 		'helpers/**/*.js',
 		'modules/*.js',
 		'logic/*.js',
@@ -45,6 +46,7 @@ module.exports = function (grunt) {
 						util.format('cp %s/config.json %s', __dirname, version_dir),
 						util.format('cp %s/package.json %s', __dirname, version_dir),
 						util.format('cp %s/genesisBlock.json %s', __dirname, version_dir),
+						util.format('cp %s/LICENSE %s', __dirname, version_dir),
 						util.format('mkdir -p %s/sql/migrations', version_dir),
 						util.format('cp %s/sql/*.sql %s/sql/', __dirname, version_dir),
 						util.format('cp %s/sql/migrations/*.sql %s/sql/migrations/', __dirname, version_dir),
@@ -111,6 +113,7 @@ module.exports = function (grunt) {
 				fix: false
 			},
 			target: [
+				'api',
 				'helpers',
 				'modules',
 				'logic',

api/http/accounts.js

@@ -0,0 +1,38 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+var schema = require('../../schema/accounts.js');
+
+// Constructor
+function AccountsHttpApi (accountsModule, app) {
+
+	var router = new Router();
+
+	router.map(accountsModule.shared, {
+		'post /open': 'open',
+		'get /getBalance': 'getBalance',
+		'get /getPublicKey': 'getPublickey',
+		'post /generatePublicKey': 'generatePublicKey',
+		'get /delegates': 'getDelegates',
+		'get /delegates/fee': 'getDelegatesFee',
+		'put /delegates': 'addDelegates',
+		'get /': 'getAccount'
+	});
+
+	router.map(accountsModule.internal, {
+		'get /count': 'count'
+	});
+
+	if (process.env.DEBUG && process.env.DEBUG.toUpperCase() === 'TRUE') {
+		router.map(accountsModule.internal, {'get /getAllAccounts': 'getAllAccounts'});
+	}
+
+	if (process.env.TOP && process.env.TOP.toUpperCase() === 'TRUE') {
+		router.get('/top', httpApi.middleware.sanitize('query', schema.top, accountsModule.internal.top));
+	}
+
+	httpApi.registerEndpoint('/api/accounts', app, router, accountsModule.isLoaded);
+}
+
+module.exports = AccountsHttpApi;

api/http/blocks.js

@@ -0,0 +1,29 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+
+// Constructor
+function BlocksHttpApi (blocksModule, app) {
+
+	var router = new Router();
+
+	router.map(blocksModule.shared, {
+		'get /get': 'getBlock',
+		'get /': 'getBlocks',
+		'get /getBroadhash': 'getBroadhash',
+		'get /getEpoch': 'getEpoch',
+		'get /getHeight': 'getHeight',
+		'get /getNethash': 'getNethash',
+		'get /getFee': 'getFee',
+		'get /getFees': 'getFees',
+		'get /getMilestone': 'getMilestone',
+		'get /getReward': 'getReward',
+		'get /getSupply': 'getSupply',
+		'get /getStatus': 'getStatus'
+	});
+
+	httpApi.registerEndpoint('/api/blocks', app, router, blocksModule.isLoaded);
+}
+
+module.exports = BlocksHttpApi;

api/http/dapps.js

@@ -0,0 +1,36 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+var schema = require('../../schema/dapps');
+
+// Constructor
+function DappsHttpApi (dappsModule, app) {
+
+	var router = new Router();
+
+	router.map(dappsModule.internal, {
+		'get /categories': 'categories',
+		'get /installed': 'installed',
+		'get /installedIds': 'installedIds',
+		'get /ismasterpasswordenabled': 'isMasterPasswordEnabled',
+		'get /installing': 'installing',
+		'get /uninstalling': 'uninstalling',
+		'get /launched': 'launched',
+		'post /launch': 'launch',
+		'put /transaction': 'addTransactions',
+		'put /withdrawal': 'sendWithdrawal'
+	});
+
+	router.get('/', httpApi.middleware.sanitize('query', schema.list, dappsModule.internal.list));
+	router.put('/', httpApi.middleware.sanitize('body', schema.put, dappsModule.internal.put));
+	router.get('/get', httpApi.middleware.sanitize('query', schema.get, dappsModule.internal.get));
+	router.get('/search', httpApi.middleware.sanitize('query', schema.search, dappsModule.internal.search));
+	router.post('/install', httpApi.middleware.sanitize('body', schema.install, dappsModule.internal.install));
+	router.post('/uninstall', httpApi.middleware.sanitize('body', schema.uninstall, dappsModule.internal.uninstall));
+	router.post('/stop', httpApi.middleware.sanitize('body', schema.stop, dappsModule.internal.stop));
+
+	httpApi.registerEndpoint('/api/dapps', app, router, dappsModule.isLoaded);
+}
+
+module.exports = DappsHttpApi;

api/http/delegates.js

@@ -0,0 +1,39 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+
+// Constructor
+function DelegatesHttpApi (delegatesModule, app) {
+
+	var router = new Router();
+
+	router.map(delegatesModule.shared, {
+		'get /count': 'count',
+		'get /search': 'search',
+		'get /voters': 'getVoters',
+		'get /get': 'getDelegate',
+		'get /': 'getDelegates',
+		'get /fee': 'getFee',
+		'get /forging/getForgedByAccount': 'getForgedByAccount',
+		'put /': 'addDelegate',
+		'get /getNextForgers': 'getNextForgers'
+	});
+
+	router.map(delegatesModule.internal, {
+		'post /forging/enable': 'forgingEnable',
+		'post /forging/disable': 'forgingDisable',
+		'get /forging/status': 'forgingStatus'
+	});
+
+	if (process.env.DEBUG) {
+		router.map(delegatesModule.internal, {
+			'get /forging/disableAll': 'forgingDisableAll',
+			'get /forging/enableAll': 'forgingEnableAll'
+		});
+	}
+
+	httpApi.registerEndpoint('/api/delegates', app, router, delegatesModule.isLoaded);
+}
+
+module.exports = DelegatesHttpApi;

api/http/loader.js

@@ -0,0 +1,24 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+
+// Constructor
+function LoaderHttpApi (loaderModule, app) {
+
+	var router = new Router();
+
+	router.map(loaderModule.shared, {
+		'get /status': 'status',
+		'get /status/sync': 'sync'
+	});
+
+	router.get('/status/ping', function (req, res) {
+		var status = loaderModule.internal.statusPing();
+		return res.status(status ? 200 : 503).json({success: status});
+	});
+
+	httpApi.registerEndpoint('/api/loader', app, router, loaderModule.isLoaded);
+}
+
+module.exports = LoaderHttpApi;

api/http/multisignatures.js

@@ -0,0 +1,21 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+
+// Constructor
+function MultisignaturesHttpApi (mutlisignaturesModule, app) {
+
+	var router = new Router();
+
+	router.map(mutlisignaturesModule.shared, {
+		'get /pending': 'pending',
+		'post /sign': 'sign',
+		'put /': 'addMultisignature',
+		'get /accounts': 'getAccounts'
+	});
+
+	httpApi.registerEndpoint('/api/multisignatures', app, router, mutlisignaturesModule.isLoaded);
+}
+
+module.exports = MultisignaturesHttpApi;

api/http/peers.js

@@ -0,0 +1,21 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+
+// Constructor
+function PeersHttpApi (peersModule, app) {
+
+	var router = new Router();
+
+	router.map(peersModule.shared, {
+		'get /': 'getPeers',
+		'get /version': 'version',
+		'get /get': 'getPeer',
+		'get /count': 'count'
+	});
+
+	httpApi.registerEndpoint('/api/peers', app, router, peersModule.isLoaded);
+}
+
+module.exports = PeersHttpApi;

api/http/server.js

@@ -0,0 +1,34 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+
+// Constructor
+function ServerHttpApi (serverModule, app) {
+
+	var router = new Router();
+
+	router.use(function (req, res, next) {
+		if (serverModule.areModulesReady()) { return next(); }
+		res.status(500).send({success: false, error: 'Blockchain is loading'});
+	});
+
+	router.get('/', function (req, res) {
+		if (serverModule.isLoaded()) {
+			res.render('wallet.html', {layout: false});
+		} else {
+			res.render('loading.html');
+		}
+	});
+
+	router.use(function (req, res, next) {
+		if (req.url.indexOf('/api/') === -1 && req.url.indexOf('/peer/') === -1) {
+			return res.redirect('/');
+		}
+		next();
+	});
+
+	app.use('/', router);
+}
+
+module.exports = ServerHttpApi;

api/http/signatures.js

@@ -0,0 +1,19 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+
+// Constructor
+function SignaturesHttpApi (signaturesModule, app) {
+
+	var router = new Router();
+
+	router.map(signaturesModule.shared, {
+		'get /fee': 'getFee',
+		'put /': 'addSignature'
+	});
+
+	httpApi.registerEndpoint('/api/signatures', app, router, signaturesModule.isLoaded);
+}
+
+module.exports = SignaturesHttpApi;

api/http/transactions.js

@@ -0,0 +1,27 @@
+'use strict';
+
+var Router = require('../../helpers/router');
+var httpApi = require('../../helpers/httpApi');
+
+// Constructor
+function TransactionsHttpApi (transactionsModule, app) {
+
+	var router = new Router();
+
+	router.map(transactionsModule.shared, {
+		'get /': 'getTransactions',
+		'get /get': 'getTransaction',
+		'get /count': 'getTransactionsCount',
+		'get /queued/get': 'getQueuedTransaction',
+		'get /queued': 'getQueuedTransactions',
+		'get /multisignatures/get': 'getMultisignatureTransaction',
+		'get /multisignatures': 'getMultisignatureTransactions',
+		'get /unconfirmed/get': 'getUnconfirmedTransaction',
+		'get /unconfirmed': 'getUnconfirmedTransactions',
+		'put /': 'addTransactions'
+	});
+
+	httpApi.registerEndpoint('/api/transactions', app, router, transactionsModule.isLoaded);
+}
+
+module.exports = TransactionsHttpApi;