Merge branch '1260-default-transactiondepth-must-be-zero' into '1.6'

Resolve "default TransactionDepth must be zero"

Closes #1260

See merge request !1239

app/lib/rules/local_rules.ts

@@ -385,7 +385,7 @@ export const LOCAL_RULES_FUNCTIONS = {
     const sindex = Indexer.sindex(index)
     const max = getMaxTransactionDepth(sindex)
     //
-    const allowedMax = block.medianTime > 1519862400 ? CommonConstants.BLOCK_MAX_TX_CHAINING_DEPTH : 1
+    const allowedMax = block.medianTime > 1519862400 ? CommonConstants.BLOCK_MAX_TX_CHAINING_DEPTH : 0
     if (max > allowedMax) {
       throw "The maximum transaction chaining length per block is " + CommonConstants.BLOCK_MAX_TX_CHAINING_DEPTH
     }

test/integration/transactions-chaining.ts

 import {CommonConstants} from "../../app/lib/common-libs/constants"
 import {TestUser} from "./tools/TestUser"
 import {TestingServer} from "./tools/toolbox"
-import {NewLogger} from "../../app/lib/logger"
 
 const should = require('should');
 const assert = require('assert');
@@ -71,9 +70,12 @@ describe("Transaction chaining", () => {
       CommonConstants.TRANSACTION_MAX_TRIES = 2;
       await unit.shouldNotFail(toc.sendTX(tx1));
       await unit.shouldNotFail(toc.sendTX(tx2));
-      (await s1.get('/tx/sources/DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo')).should.have.property('sources').length(1);
-      (await s1.get('/tx/sources/DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV')).should.have.property('sources').length(1);
-      await s1.commit({ time: now + 7210 }); // TX1 + TX2 commited
+      (await s1.get('/tx/sources/DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo')).should.have.property('sources').length(1); // 1200
+      (await s1.get('/tx/sources/DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV')).should.have.property('sources').length(1); // 1200
+      await s1.commit({ time: now + 7210 }); // TX1 commited only
+      (await s1.get('/tx/sources/DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo')).should.have.property('sources').length(1); // 1200 - 1040 = 160 remaining
+      (await s1.get('/tx/sources/DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV')).should.have.property('sources').length(2); // The UD + 1040 units sent by toc
+      await s1.commit({ time: now + 7210 }); // TX2 commited now (cause it couldn't be chained before)
       (await s1.get('/tx/sources/DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo')).should.have.property('sources').length(0);
       (await s1.get('/tx/sources/DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV')).should.have.property('sources').length(3); // The UD + 1040 + 160 units sent by toc
       CommonConstants.TRANSACTION_MAX_TRIES = tmp;