Merge pull request duality-solutions#267 from EhssanD/v2.4-WIP

Duality-CDOO · web-flow · commit eb459d22608b · 2018-12-29T22:30:47.000+01:00
Fixed miner issues
diff --git a/src/miner/impl/miner-gpu.cpp b/src/miner/impl/miner-gpu.cpp
@@ -27,8 +27,12 @@ int64_t GPUMiner::TryMineBlock(CBlock& block)
     const auto _end = END(block.nNonce);
     const void* input = (_begin == _end ? pblank : static_cast<const void*>(&_begin[0]));
     const std::uint64_t device_target = ArithToUint256(_hash_target).GetUint64(3);
+    std::uint32_t start_nonce = block.nNonce;
 
-    std::uint32_t result_nonce = _processing_unit.scanNonces(input, block.nNonce, device_target);
+    //Increase nNonce for the next batch
+    block.nNonce += _batch_size_target;
+
+    std::uint32_t result_nonce = _processing_unit.scanNonces(input, start_nonce, device_target);
 
     if ( result_nonce < std::numeric_limits<uint32_t>::max()){
         block.nNonce = result_nonce;
diff --git a/src/miner/miner-util.cpp b/src/miner/miner-util.cpp
@@ -379,6 +379,8 @@ void SetBlockPubkeyScript(CBlock& block, const CScript& scriptPubKeyIn)
     CMutableTransaction txCoinbase(*block.vtx[0]);
     // Set coinbase out address
     txCoinbase.vout[0].scriptPubKey = scriptPubKeyIn;
+    //It should be added to the block
+    block.vtx[0] = MakeTransactionRef(std::move(txCoinbase));
     // Generate merkle root hash
     block.hashMerkleRoot = BlockMerkleRoot(block);
 }

Original file line number	Diff line number	Diff line change
`@@ -379,6 +379,8 @@ void SetBlockPubkeyScript(CBlock& block, const CScript& scriptPubKeyIn)`
`379`	`379`	`CMutableTransaction txCoinbase(*block.vtx[0]);`
`380`	`380`	`// Set coinbase out address`
`381`	`381`	`txCoinbase.vout[0].scriptPubKey = scriptPubKeyIn;`
	`382`	`+ //It should be added to the block`
	`383`	`+ block.vtx[0] = MakeTransactionRef(std::move(txCoinbase));`
`382`	`384`	`// Generate merkle root hash`
`383`	`385`	`block.hashMerkleRoot = BlockMerkleRoot(block);`
`384`	`386`	`}`