Revert "Backporting changes from development."

This reverts commit 6e30d5f.

app.js

@@ -71,9 +71,6 @@ if (program.snapshot) {
 	);
 }
 
-// Define top endpoint availability
-process.env.TOP =  appConfig.topAccounts;
-
 var config = {
 	db: appConfig.db,
 	modules: {

config.json

@@ -6,7 +6,6 @@
     "logFileName": "logs/lisk.log",
     "consoleLogLevel": "info",
     "trustProxy": false,
-    "topAccounts": false,
     "db": {
         "host": "localhost",
         "port": 5432,

helpers/z_schema.js

@@ -3,30 +3,6 @@
 var ip = require('ip');
 var z_schema = require('z-schema');
 
-z_schema.registerFormat('id', function (str) {
-  if (str.length === 0) {
-    return true;
-  }
-
-  return /^[0-9]+$/g.test(str);
-});
-
-z_schema.registerFormat('address', function (str) {
-  if (str.length === 0) {
-    return true;
-  }
-
-  return /^[0-9]+[L]$/ig.test(str);
-});
-
-z_schema.registerFormat('username', function (str) {
-  if (str.length === 0) {
-    return true;
-  }
-
-  return /^[a-z0-9!@$&_.]+$/ig.test(str);
-});
-
 z_schema.registerFormat('hex', function (str) {
   try {
     new Buffer(str, 'hex');
@@ -101,22 +77,6 @@ z_schema.registerFormat('ip', function (str) {
   return ip.isV4Format(str);
 });
 
-z_schema.registerFormat('os', function (str) {
-  if (str.length === 0) {
-    return true;
-  }
-
-  return /^[a-z0-9-_.]+$/ig.test(str);
-});
-
-z_schema.registerFormat('version', function (str) {
-  if (str.length === 0) {
-    return true;
-  }
-
-  return /^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})([a-z]{1})?$/g.test(str);
-});
-
 // var registeredFormats = z_schema.getRegisteredFormats();
 // console.log(registeredFormats);
 

logic/transaction.js

@@ -6,7 +6,6 @@ var ByteBuffer = require('bytebuffer');
 var constants = require('../helpers/constants.js');
 var crypto = require('crypto');
 var exceptions = require('../helpers/exceptions.js');
-var extend = require('extend');
 var slots = require('../helpers/slots.js');
 var sql = require('../sql/transactions.js');
 
@@ -821,7 +820,7 @@ Transaction.prototype.dbRead = function (raw) {
 		var asset = __private.types[tx.type].dbRead.call(this, raw);
 
 		if (asset) {
-			tx.asset = extend(tx.asset, asset);
+			tx.asset = _.extend(tx.asset, asset);
 		}
 
 		return tx;

modules/accounts.js

@@ -116,9 +116,6 @@ __private.openAccount = function (secret, cb) {
 		}
 
 		if (account) {
-			if (account.publicKey == null) {
-				account.publicKey = publicKey;
-			}
 			return setImmediate(cb, null, account);
 		} else {
 			return setImmediate(cb, null, {

modules/blocks.js

@@ -502,15 +502,6 @@ Blocks.prototype.getCommonBlock = function (peer, height, cb) {
 				}
 			});
 		},
-		function (res, waterCb) {
-			library.schema.validate(res.body.common, schema.getCommonBlock, function (err) {
-				if (err) {
-					return setImmediate(waterCb, err[0].message);
-				} else {
-					return setImmediate(waterCb, null, res);
-				}
-			});
-		},
 		function (res, waterCb) {
 			library.db.query(sql.getCommonBlock(res.body.common.previousBlock), {
 				id: res.body.common.id,

modules/dapps.js

@@ -672,7 +672,7 @@ __private.getInstalledIds = function (cb) {
 		if (err) {
 			return setImmediate(cb, err);
 		} else {
-			var regExp = new RegExp(/[0-9]{1,20}/);
+			var regExp = new RegExp(/[0-9]{18,20}/);
 
 			ids = _.filter(ids, function (f) {
 				return regExp.test(f.toString());

modules/peers.js

@@ -144,7 +144,7 @@ __private.getByFilter = function (filter, cb) {
 	var where = [];
 	var params = {};
 
-	if (filter.state >= 0) {
+	if (filter.state) {
 		where.push('"state" = ${state}');
 		params.state = filter.state;
 	}
@@ -216,7 +216,6 @@ Peers.prototype.inspect = function (peer) {
 	}
 
 	peer.port = parseInt(peer.port);
-	peer.port = isNaN(peer.port) ? 0 : peer.port;
 
 	if (peer.ip) {
 		peer.string = (peer.ip + ':' + peer.port || 'unknown');

modules/transactions.js

@@ -188,6 +188,8 @@ __private.addUnconfirmedTransaction = function (transaction, sender, cb) {
 		if (err) {
 			self.removeUnconfirmedTransaction(transaction.id);
 			return setImmediate(cb, err);
+		} else if (modules.loader.syncing()) {
+			self.undoUnconfirmed(transaction, cb);
 		} else {
 			transaction.receivedAt = new Date();
 			__private.unconfirmedTransactions.push(transaction);
@@ -235,11 +237,6 @@ Transactions.prototype.processUnconfirmedTransaction = function (transaction, br
 		return setImmediate(cb, 'Missing transaction');
 	}
 
-	// Ignore transaction when syncing
-	if (modules.loader.syncing()) {
-		return setImmediate(cb);
-	}
-
 	// Check transaction indexes
 	if (__private.unconfirmedTransactionsIdIndex[transaction.id] !== undefined) {
 		library.logger.debug('Transaction is already processed: ' + transaction.id);

modules/transport.js

@@ -438,7 +438,7 @@ Transport.prototype.getFromPeer = function (peer, options, cb) {
 	var req = {
 		url: 'http://' + peer.ip + ':' + peer.port + url,
 		method: options.method,
-		headers: extend({}, __private.headers, options.headers),
+		headers: _.extend({}, __private.headers, options.headers),
 		timeout: library.config.peers.options.timeout
 	};
 

schema/accounts.js

@@ -19,9 +19,7 @@ module.exports = {
 		properties: {
 			address: {
 				type: 'string',
-				format: 'address',
-				minLength: 1,
-				maxLength: 22
+				minLength: 1
 			}
 		},
 		required: ['address']
@@ -32,9 +30,7 @@ module.exports = {
 		properties: {
 			address: {
 				type: 'string',
-				format: 'address',
-				minLength: 1,
-				maxLength: 22
+				minLength: 1
 			}
 		},
 		required: ['address']
@@ -45,8 +41,7 @@ module.exports = {
 		properties: {
 			secret: {
 				type: 'string',
-				minLength: 1,
-				maxLength: 100
+				minLength: 1
 			}
 		},
 		required: ['secret']
@@ -57,9 +52,7 @@ module.exports = {
 		properties: {
 			address: {
 				type: 'string',
-				format: 'address',
-				minLength: 1,
-				maxLength: 22
+				minLength: 1
 			}
 		},
 		required: ['address']
@@ -70,17 +63,15 @@ module.exports = {
 		properties: {
 			secret: {
 				type: 'string',
-				minLength: 1,
-				maxLength: 100
+				minLength: 1
 			},
 			publicKey: {
 				type: 'string',
 				format: 'publicKey'
 			},
 			secondSecret: {
 				type: 'string',
-				minLength: 1,
-				maxLength: 100
+				minLength: 1
 			}
 		}
 	},
@@ -90,9 +81,7 @@ module.exports = {
 		properties: {
 			address: {
 				type: 'string',
-				format: 'address',
-				minLength: 1,
-				maxLength: 22
+				minLength: 1
 			}
 		},
 		required: ['address']

schema/blocks.js

@@ -13,9 +13,7 @@ module.exports = {
 		properties: {
 			id: {
 				type: 'string',
-				format: 'id',
-				minLength: 1,
-				maxLength: 20
+				minLength: 1
 			}
 		},
 		required: ['id']
@@ -26,7 +24,7 @@ module.exports = {
 		properties: {
 			limit: {
 				type: 'integer',
-				minimum: 1,
+				minimum: 0,
 				maximum: 100
 			},
 			orderBy: {
@@ -55,38 +53,11 @@ module.exports = {
 				minimum: 0
 			},
 			previousBlock: {
-				type: 'string',
-				format: 'id',
-				minLength: 1,
-				maxLength: 20
+				type: 'string'
 			},
 			height: {
-				type: 'integer',
-				minimum: 1
+				type: 'integer'
 			}
 		}
-	},
-	getCommonBlock: {
-		id: 'blocks.getCommonBlock',
-		type: 'object',
-		properties: {
-			id: {
-				type: 'string',
-				format: 'id',
-				minLength: 1,
-				maxLength: 20
-			},
-			previousBlock: {
-				type: 'string',
-				format: 'id',
-				minLength: 1,
-				maxLength: 20
-			},
-			height: {
-				type: 'integer',
-				minimum: 1
-			}
-		},
-		required: ['id', 'previousBlock', 'height']
 	}
 };