interfaces/mining: Add createNewBlock2 that does not override or lose…

… options
bitcoinknots · Jan 31, 2025 · 17e4942 · 17e4942
1 parent 4553884
commit 17e4942
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/interfaces/mining.h b/src/interfaces/mining.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_INTERFACES_MINING_H
 #define BITCOIN_INTERFACES_MINING_H
 
+#include <node/miner.h>
 #include <node/types.h>
 #include <uint256.h>
 
@@ -40,13 +41,14 @@ class Mining
     virtual std::optional<uint256> getTipHash() = 0;
 
    /**
-     * Construct a new block template
+     * Construct a new block template. For the createNewBlock variant, subclass options (if any) are silently lost and overridden by any config args. For createNewBlock2, the options are assumed to be complete.
      *
      * @param[in] script_pub_key the coinbase output
      * @param[in] options options for creating the block
      * @returns a block template
      */
     virtual std::unique_ptr<node::CBlockTemplate> createNewBlock(const CScript& script_pub_key, const node::BlockCreateOptions& options={}) = 0;
+    virtual std::unique_ptr<node::CBlockTemplate> createNewBlock2(const CScript& script_pub_key, const node::BlockAssembler::Options& assemble_options) = 0;
 
     /**
      * Processes new block. A valid new block is automatically relayed to peers.

diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
@@ -913,6 +913,11 @@ class MinerImpl : public Mining
     {
         BlockAssembler::Options assemble_options{options};
         ApplyArgsManOptions(*Assert(m_node.args), assemble_options);
+        return createNewBlock2(script_pub_key, assemble_options);
+    }
+
+    std::unique_ptr<CBlockTemplate> createNewBlock2(const CScript& script_pub_key, const BlockAssembler::Options& assemble_options) override
+    {
         return BlockAssembler{chainman().ActiveChainstate(), context()->mempool.get(), assemble_options}.CreateNewBlock(script_pub_key);
     }