message: Fix bug introduced by a bad merge conflict resolution
diff: @@ -525,6 +525,7 @@ bool BlockAssembler::AttemptToAddContractToBlock(CTxMemPool::txiter iter){
  uint64_t nBlockSigOpsCost = this->nBlockSigOpsCost;
  QtumTxConverter convert(iter->GetTx(), NULL);
  + std::vector<QtumTransaction> transactions = convert.extractionQtumTransactions();
  ByteCodeExec exec(*pblock, convert.extractionQtumTransactions());
  exec.performByteCode();
  ByteCodeExecResult testExecResult = exec.processingResults();
  @@ -579,27 +580,8 @@ bool BlockAssembler::AttemptToAddContractToBlock(CTxMemPool::txiter iter){
  bceResult.refundSender += testExecResult.refundSender;
  bceResult.refundOutputs.insert(bceResult.refundOutputs.end(), testExecResult.refundOutputs.begin(), testExecResult.refundOutputs.end());
  bceResult.valueTransfers = std::move(testExecResult.valueTransfers);
  -////////////////////////////////////////////////////////////// // qtum
  - const CTransaction& tx = iter->GetTx();
  - if(tx.HasCreateOrCall()){
  -
  - dev::h256 oldHashQtumRoot(globalState->rootHashUTXO());
  - dev::h256 oldHashStateRoot(globalState->rootHash());
  - QtumTxConverter convert(tx, NULL);
  - std::vector<QtumTransaction> transactions = convert.extractionQtumTransactions();
  - ByteCodeExec exec(*pblock, transactions);
  - exec.performByteCode();
  - ByteCodeExecResult res = exec.processingResults();
  -
  - bceResult.usedFee += res.usedFee;
  - bceResult.refundSender += res.refundSender;
  - bceResult.refundOutputs.insert(bceResult.refundOutputs.end(), res.refundOutputs.begin(), res.refundOutputs.end());
  - bceResult.valueTransfers = std::move(res.valueTransfers);
  -
  - EnforceContractVoutLimit(res, bceResult, oldHashQtumRoot, oldHashStateRoot, transactions);
  - }
  -//////////////////////////////////////////////////////////////
  + EnforceContractVoutLimit(testExecResult, bceResult, oldHashStateRoot, oldHashStateRoot, transactions);
  pblock->vtx.emplace_back(iter->GetSharedTx());
  pblocktemplate->vTxFees.push_back(iter->GetFee());
  