Merge pull request #16 from LiskHQ/0.9.10-multisig_dapp_simultaneously

Bug resolution for multisignature transaction

Jenkinsfile

@@ -186,6 +186,15 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
         '''
       }
       },
+      "Functional Multisignatures - 2" : {
+        node('node-01'){
+        sh '''
+        export TEST=test/api/multisignature.with.other.transactions.js TEST_TYPE='FUNC'
+        cd "$(echo $WORKSPACE | cut -f 1 -d '@')"
+        npm run jenkins
+        '''
+      }
+      },
       "Functional Signatures" : {
         node('node-01'){
         sh '''

logic/block.js

@@ -7,6 +7,8 @@ var ByteBuffer = require('bytebuffer');
 var BlockReward = require('../logic/blockReward.js');
 var constants = require('../helpers/constants.js');
 
+var transactionTypes = require('../helpers/transactionTypes.js');
+
 // Private fields
 var __private = {};
 
@@ -75,8 +77,14 @@ __private.getAddressByPublicKey = function (publicKey) {
  */
 Block.prototype.create = function (data) {
 	var transactions = data.transactions.sort(function compare (a, b) {
+		// Place MULTI transaction after all other transaction types
+		if (a.type === transactionTypes.MULTI && b.type !== transactionTypes.MULTI) { return 1; }
+		// Place all other transaction types before MULTI transaction
+		if (a.type !== transactionTypes.MULTI && b.type === transactionTypes.MULTI) { return -1; }
+		// Place depending on type (lower first)
 		if (a.type < b.type) { return -1; }
 		if (a.type > b.type) { return 1; }
+		// Place depending on amount (lower first)
 		if (a.amount < b.amount) { return -1; }
 		if (a.amount > b.amount) { return 1; }
 		return 0;

package.json

@@ -54,6 +54,7 @@
     "z-schema": "=3.18.2"
   },
   "devDependencies": {
+    "rewire": "=2.5.2",
     "bitcore-mnemonic": "=1.1.1",
     "browserify-bignum": "=1.3.0-2",
     "chai": "=3.5.0",