Fix CPUNet after rebase

    * Update build instructions to use cmake
    * Update miner script due to test framework changes
    * Restore -ntasks parameter in bitcoin-utils (was commented out for
      some reason?)

Author: mcelrath

contrib/cpunet/README.md

@@ -18,49 +18,46 @@ have `-cpunet` or they will fail.
 
 1. Compile CPUNet:
 
-        ./configure make -j16
+        cmake -B build -DWITH_ZMQ=ON -DENABLE_IPC=ON -DENABLE_WALLET=OFF
+        cmake --build build
 
 2. Run cpunet node:
 
-        src/bitcoind -cpunet -zmqpubsequence=tcp://127.0.0.1:28338
+        build/bin/bitcoind -cpunet -zmqpubsequence=tcp://127.0.0.1:28338
 
     or
 
         # if you have already created the wallet
-        src/bitcoind -cpunet -wallet=cpunet -zmqpubsequence=tcp://127.0.0.1:28338
+        build/bin/bitcoind -cpunet -wallet=cpunet -zmqpubsequence=tcp://127.0.0.1:28338
 
 3. Create and open a wallet: (only needs to be done once)
 
-        src/bitcoin-cli -cpunet createwallet cpunet
-        src/bitcoin-cli -cpunet loadwallet cpunet
+        build/bin/bitcoin-cli -cpunet createwallet cpunet
+        build/bin/bitcoin-cli -cpunet loadwallet cpunet
 
 4. Generate blocks:
 
-        contrib/cpunet/miner --cli=src/bitcoin-cli --ongoing --address `src/bitcoin-cli -cpunet getnewaddress` --grind-cmd="src/bitcoin-util -cpunet -ntasks=1 grind"
+        contrib/cpunet/miner --cli=build/bin/bitcoin-cli --ongoing --address `build/bin/bitcoin-cli -cpunet getnewaddress` --grind-cmd="build/bin/bitcoin-util -cpunet -ntasks=1 grind"
 
 TODO
 ====
 
-1. Set up a seed node so we can find peers
-
-2. Create a docker container to run this
-
-3. Add an argument -my-block-latency artificial latency parameter that will
+1. Add an argument -my-block-latency artificial latency parameter that will
    delay starting mining a new block when the block found is mine.
 
-4. Add an argument -other-block-latency artificial latency parameter that will
+2. Add an argument -other-block-latency artificial latency parameter that will
    delay starting mining a new block when a new block is found by another miner
    and announced to contrib/cpunet/miner via ZMQ. (Related to "Clean Jobs"
    stratum parameter)
 
-5. Add SV2 support and use an external SV2 miner instead of bitcoin-utils
+3. Add SV2 support and use an external SV2 miner instead of bitcoin-utils
 
-6. Add a -share-difficulty argument to mine shares of lower difficulty than the
+4. Add a -share-difficulty argument to mine shares of lower difficulty than the
    block target
 
-7. Add a -share-cmd to submit shares to a pool.
+5. Add a -share-cmd to submit shares to a pool.
 
-8. The way I changed the PoW hash means that it screws up mainnet, signet, and
+6. The way I changed the PoW hash means that it screws up mainnet, signet, and
    the testnets and assertions have to be commented out. Therefore this cannot
    be merged into Bitcoin unless we find a way to detect `-cpunet` and calculate
    the block hash differently. I don't see a way to get the network parameters

contrib/cpunet/miner

@@ -38,21 +38,21 @@ logging.basicConfig(
 # "cpunet" to the end of the block header and hash that instead. It should match
 # src/primitives/block.cpp:13, CBlockHeader::GetHash()
 # This is copied/modifed from test/functional/test_framework/messages.py:732
-def CBlockHeader_calc_sha256(self):
-    if self.sha256 is None:
-        r = b""
-        r += self.nVersion.to_bytes(4, "little", signed=True)
-        r += ser_uint256(self.hashPrevBlock)
-        r += ser_uint256(self.hashMerkleRoot)
-        r += self.nTime.to_bytes(4, "little")
-        r += self.nBits.to_bytes(4, "little")
-        r += self.nNonce.to_bytes(4, "little")
-        r += b"cpunet\x00"
-        self.sha256 = uint256_from_str(hash256(r))
-        self.hash = hash256(r)[::-1].hex()
-
-CBlock.old_calc_sha256 = CBlock.calc_sha256
-CBlockHeader.calc_sha256 = CBlockHeader_calc_sha256
+def CBlockHeader_hash_hex(self):
+    r = self._serialize_header()
+    r += b"cpunet\x00"
+    return hash256(r)[::-1].hex()
+
+def CBlockHeader_hash_int(self):
+    r = self._serialize_header()
+    r += b"cpunet\x00"
+    return uint256_from_str(hash256(r))
+
+CBlockHeader.old_hash_hex = CBlockHeader.hash_hex
+CBlockHeader.hash_hex = CBlockHeader_hash_hex
+
+CBlockHeader.old_hash_int = CBlockHeader.hash_int
+CBlockHeader.hash_int = CBlockHeader_hash_int
 
 class CPUMiner():
     def __init__(self, args):
@@ -183,7 +183,6 @@ class CPUMiner():
                           script_BIP34_coinbase_height(tmpl["height"]), 0xffffffff)]
         cbtx.vout = [CTxOut(tmpl["coinbasevalue"], self.reward_spk)]
         cbtx.vin[0].nSequence = 2**32-2
-        cbtx.rehash()
 
         # Construct block
         block = CBlock()
@@ -221,17 +220,18 @@ class CPUMiner():
             self.mined_blocks += 1
             newhead = from_hex(CBlockHeader(), stdout.decode('utf8'))
             block.nNonce = newhead.nNonce
-            block.rehash()
 
             # Submit block
             r = await self.bitcoin_cli("-stdin", "submitblock", input=block.serialize().hex().encode('utf8'))
             logging.debug("Submitting block: %s", block.serialize().hex())
             if r != "":
-                logging.warning("submitblock returned %s for height %d hash %s", r, tmpl["height"], block.hash)
+                logging.warning("submitblock returned %s for height %d hash %s",
+                                r, tmpl["height"], block.hash_hex())
 
             # Report
-            logging.info("Mined a block solution at height %d with hash: %s"%(tmpl["height"], block.hash))
-            logging.debug("Block hash %s payout to %s", block.hash, self.reward_addr)
+            logging.info("Mined a block solution at height %d with hash: %s"%(tmpl["height"],
+                                                                              block.hash_hex()))
+            logging.debug("Block hash %s payout to %s", block.hash_hex(), self.reward_addr)
             logging.debug("Solved block is %s", block)
 
         # Run the next iteration

src/bitcoin-util.cpp

@@ -132,12 +132,12 @@ static int Grind(const std::vector<std::string>& args, std::string& strPrint)
 
     std::vector<std::thread> threads;
     uint16_t n_tasks = std::max(1u, std::thread::hardware_concurrency());
-    // if(gArgs.IsArgSet("-ntasks")) {
-    //     if(!ParseUInt16(gArgs.GetArg("-ntasks", "1"), &n_tasks)) {
-    //         strPrint = strprintf("Argument to -ntasks should be a number, found %s\n", *gArgs.GetArg("-ntasks"));
-    //         return EXIT_FAILURE;
-    //     }
-    // }
+    if(gArgs.IsArgSet("-ntasks")) {
+        if(!ParseUInt16(gArgs.GetArg("-ntasks", "1"), &n_tasks)) {
+            strPrint = strprintf("Argument to -ntasks should be a number, found %s\n", *gArgs.GetArg("-ntasks"));
+            return EXIT_FAILURE;
+        }
+    }
     threads.reserve(n_tasks);
     for (int i = 0; i < n_tasks; ++i) {
         threads.emplace_back(grind_task, nBits, header, i, n_tasks, std::ref(found), std::ref(proposed_nonce));