Rewrite transaction pool - Closes #561

app.js

@@ -79,6 +79,7 @@ var config = {
 	root: path.dirname(__filename),
 	db: appConfig.db,
 	cache: appConfig.redis,
+	pool: appConfig.transactions.pool,
 	cacheEnabled: appConfig.cacheEnabled,
 	modules: {
 		accounts: './modules/accounts.js',
@@ -439,6 +440,7 @@ d.run(function () {
 		 */
 		logic: ['db', 'bus', 'schema', 'genesisblock', function (scope, cb) {
 			var Transaction = require('./logic/transaction.js');
+			var TransactionPool = require('./logic/transactions/pool.js');
 			var Block = require('./logic/block.js');
 			var Account = require('./logic/account.js');
 			var Peers = require('./logic/peers.js');
@@ -470,6 +472,9 @@ d.run(function () {
 				transaction: ['db', 'bus', 'ed', 'schema', 'genesisblock', 'account', 'logger', function (scope, cb) {
 					new Transaction(scope.db, scope.ed, scope.schema, scope.genesisblock, scope.account, scope.logger, cb);
 				}],
+				transactionPool: ['db', 'bus', 'ed', 'schema', 'genesisblock', 'account', 'logger', 'transaction', function (scope, cb) {
+					new TransactionPool(scope.bus, scope.ed, scope.transaction, scope.account, scope.logger, config.pool, cb);
+				}],
 				block: ['db', 'bus', 'ed', 'schema', 'genesisblock', 'account', 'transaction', function (scope, cb) {
 					new Block(scope.ed, scope.schema, scope.transaction, cb);
 				}],

config.json

@@ -110,7 +110,12 @@
     "relayLimit": 2
   },
   "transactions": {
-    "maxTxsPerQueue": 1000
+    "maxTxsPerQueue": 1000,
+    "pool": {
+      "storageLimit": 4000,
+      "processInterval": 5000,
+      "expiryInterval": 25000
+    }
   },
   "forging": {
     "force": false,

helpers/constants.js

@@ -114,7 +114,9 @@ var constants = {
 	signatureLength: 196,
 	// WARNING: When changing totalAmount you also need to change getBlockRewards(int) SQL function!
 	totalAmount: 10000000000000000,
-	unconfirmedTransactionTimeOut: 10800 // 1080 blocks
+	unconfirmedTransactionTimeOut: 10800, // 1080 blocks
+	secondsPerHour: 3600,
+	signatureTransactionTimeOutMultiplier: 8
 };
 
 module.exports = constants;

logic/transaction.js

@@ -529,12 +529,14 @@ Transaction.prototype.verify = function (transaction, sender, requester, cb) {
 	}
 
 	// Check confirmed sender balance
-	var amount = new bignum(transaction.amount.toString()).plus(transaction.fee.toString());
-	var senderBalance = this.checkBalance(amount, 'balance', transaction, sender);
+	/* TODO: This check will be done in the transaction pool
+	var amount = new bignum(trs.amount.toString()).plus(trs.fee.toString());
+	var senderBalance = this.checkBalance(amount, 'balance', trs, sender);
 
 	if (senderBalance.exceeded) {
 		return setImmediate(cb, senderBalance.error);
 	}
+	*/
 
 	// Check timestamp
 	if (slots.getSlotNumber(transaction.timestamp) > slots.getSlotNumber()) {
@@ -660,6 +662,7 @@ Transaction.prototype.apply = function (transaction, block, sender, cb) {
 	}
 
 	// Check confirmed sender balance
+	// TODO: Check if this is done by the transaction pool in all the scenarios
 	var amount = new bignum(transaction.amount.toString()).plus(transaction.fee.toString());
 	// TODO: Check if this is done by pool in all the scenarios
 	var senderBalance = this.checkBalance(amount, 'balance', transaction, sender);