mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-20 23:29:12 +01:00
6eaa00fe20test: clarify submitBlock() mutates the template (Sjors Provoost)862bd43283mining: ensure witness commitment check in submitBlock (Sjors Provoost)00d1b6ef4bdoc: clarify UpdateUncommittedBlockStructures (Sjors Provoost) Pull request description: When an IPC client requests a new block template via the Mining interface, we hold on to its `CBlock`. That way when they call `submitSolution()` we can modify it in place, rather than having to reconstruct the full block like the `submitblock` RPC does. Before this commit however we forgot to invalidate `m_checked_witness_commitment`, which we should since the client brings a new coinbase. This would cause us to accept an invalid chaintip. Fix this and add a test to confirm that we now reject such a block. As a sanity check, we add a second node to the test and confirm that will accept our mined block. As first noticed in #33374 the IPC code takes the coinbase as provided, unlike the `submitblock` RPC which calls `UpdateUncommittedBlockStructures()` and adds witness commitment to the coinbase if it was missing. Although that could have been an alternative fix, we instead document that IPC clients are expected to provide the full coinbase including witness commitment. Patch to produce the original issue: ```diff diff --git a/src/node/miner.cpp b/src/node/miner.cpp index b988e28a3f..28e9048a4d 100644 --- a/src/node/miner.cpp +++ b/src/node/miner.cpp @@ -450,15 +450,10 @@ void AddMerkleRootAndCoinbase(CBlock& block, CTransactionRef coinbase, uint32_t } block.nVersion = version; block.nTime = timestamp; block.nNonce = nonce; block.hashMerkleRoot = BlockMerkleRoot(block); - - // Reset cached checks - block.m_checked_witness_commitment = false; - block.m_checked_merkle_root = false; - block.fChecked = false; } std::unique_ptr<CBlockTemplate> WaitAndCreateNewBlock(ChainstateManager& chainman, KernelNotifications& kernel_notifications, CTxMemPool* mempool, diff --git a/test/functional/interface_ipc.py b/test/functional/interface_ipc.py index cce56e3294..bf1b7048ab 100755 --- a/test/functional/interface_ipc.py +++ b/test/functional/interface_ipc.py @@ -216,22 +216,22 @@ class IPCInterfaceTest(BitcoinTestFramework): assert_equal(res.result, True) # The remote template block will be mutated, capture the original: remote_block_before = await self.parse_and_deserialize_block(template, ctx) - self.log.debug("Submitted coinbase must include witness") + self.log.debug("Submitted coinbase with missing witness is accepted") assert_not_equal(coinbase.serialize_without_witness().hex(), coinbase.serialize().hex()) res = await template.result.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize_without_witness()) - assert_equal(res.result, False) + assert_equal(res.result, True) self.log.debug("Even a rejected submitBlock() mutates the template's block") # Can be used by clients to download and inspect the (rejected) # reconstructed block. remote_block_after = await self.parse_and_deserialize_block(template, ctx) assert_not_equal(remote_block_before.serialize().hex(), remote_block_after.serialize().hex()) - self.log.debug("Submit again, with the witness") + self.log.debug("Submit again, with the witness - does not replace the invalid block") res = await template.result.submitSolution(ctx, block.nVersion, block.nTime, block.nNonce, coinbase.serialize()) assert_equal(res.result, True) self.log.debug("Block should propagate") assert_equal(self.nodes[1].getchaintips()[0]["height"], current_block_height + 1) ``` ACKs for top commit: ryanofsky: Code review ACK6eaa00fe20. Just documentation updates and test clarifications since last review, also splitting up a commit. TheCharlatan: Re-ACK6eaa00fe20ismaelsadeeq: Code review and tested ACK6eaa00fe20Tree-SHA512: 3a6280345b0290fe8300ebc63c13ad4058d24ceb35b7d7a784b974d5f04f420860ac03a9bf2fc6a799ef3fc55552ce033e879fa369298f976b9a01d72bd55d9e
161 lines
5.7 KiB
C++
161 lines
5.7 KiB
C++
// Copyright (c) 2024-present The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_INTERFACES_MINING_H
|
|
#define BITCOIN_INTERFACES_MINING_H
|
|
|
|
#include <consensus/amount.h>
|
|
#include <interfaces/types.h>
|
|
#include <node/types.h>
|
|
#include <primitives/block.h>
|
|
#include <primitives/transaction.h>
|
|
#include <uint256.h>
|
|
#include <util/time.h>
|
|
|
|
#include <cstdint>
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <vector>
|
|
|
|
namespace node {
|
|
struct NodeContext;
|
|
} // namespace node
|
|
|
|
class BlockValidationState;
|
|
class CScript;
|
|
|
|
namespace interfaces {
|
|
|
|
//! Block template interface
|
|
class BlockTemplate
|
|
{
|
|
public:
|
|
virtual ~BlockTemplate() = default;
|
|
|
|
virtual CBlockHeader getBlockHeader() = 0;
|
|
// Block contains a dummy coinbase transaction that should not be used.
|
|
virtual CBlock getBlock() = 0;
|
|
|
|
// Fees per transaction, not including coinbase transaction.
|
|
virtual std::vector<CAmount> getTxFees() = 0;
|
|
// Sigop cost per transaction, not including coinbase transaction.
|
|
virtual std::vector<int64_t> getTxSigops() = 0;
|
|
|
|
virtual CTransactionRef getCoinbaseTx() = 0;
|
|
virtual std::vector<unsigned char> getCoinbaseCommitment() = 0;
|
|
virtual int getWitnessCommitmentIndex() = 0;
|
|
|
|
/**
|
|
* Compute merkle path to the coinbase transaction
|
|
*
|
|
* @return merkle path ordered from the deepest
|
|
*/
|
|
virtual std::vector<uint256> getCoinbaseMerklePath() = 0;
|
|
|
|
/**
|
|
* Construct and broadcast the block. Modifies the template in place,
|
|
* updating the fields listed below as well as the merkle root.
|
|
*
|
|
* @param[in] version version block header field
|
|
* @param[in] timestamp time block header field (unix timestamp)
|
|
* @param[in] nonce nonce block header field
|
|
* @param[in] coinbase complete coinbase transaction (including witness)
|
|
*
|
|
* @note unlike the submitblock RPC, this method does NOT add the
|
|
* coinbase witness automatically.
|
|
*
|
|
* @returns if the block was processed, does not necessarily indicate validity.
|
|
*
|
|
* @note Returns true if the block is already known, which can happen if
|
|
* the solved block is constructed and broadcast by multiple nodes
|
|
* (e.g. both the miner who constructed the template and the pool).
|
|
*/
|
|
virtual bool submitSolution(uint32_t version, uint32_t timestamp, uint32_t nonce, CTransactionRef coinbase) = 0;
|
|
|
|
/**
|
|
* Waits for fees in the next block to rise, a new tip or the timeout.
|
|
*
|
|
* @param[in] options Control the timeout (default forever) and by how much total fees
|
|
* for the next block should rise (default infinite).
|
|
*
|
|
* @returns a new BlockTemplate or nothing if the timeout occurs.
|
|
*
|
|
* On testnet this will additionally return a template with difficulty 1 if
|
|
* the tip is more than 20 minutes old.
|
|
*/
|
|
virtual std::unique_ptr<BlockTemplate> waitNext(const node::BlockWaitOptions options = {}) = 0;
|
|
|
|
/**
|
|
* Interrupts the current wait for the next block template.
|
|
*/
|
|
virtual void interruptWait() = 0;
|
|
};
|
|
|
|
//! Interface giving clients (RPC, Stratum v2 Template Provider in the future)
|
|
//! ability to create block templates.
|
|
class Mining
|
|
{
|
|
public:
|
|
virtual ~Mining() = default;
|
|
|
|
//! If this chain is exclusively used for testing
|
|
virtual bool isTestChain() = 0;
|
|
|
|
//! Returns whether IBD is still in progress.
|
|
virtual bool isInitialBlockDownload() = 0;
|
|
|
|
//! Returns the hash and height for the tip of this chain
|
|
virtual std::optional<BlockRef> getTip() = 0;
|
|
|
|
/**
|
|
* Waits for the connected tip to change. During node initialization, this will
|
|
* wait until the tip is connected (regardless of `timeout`).
|
|
*
|
|
* @param[in] current_tip block hash of the current chain tip. Function waits
|
|
* for the chain tip to differ from this.
|
|
* @param[in] timeout how long to wait for a new tip (default is forever)
|
|
*
|
|
* @retval BlockRef hash and height of the current chain tip after this call.
|
|
* @retval std::nullopt if the node is shut down.
|
|
*/
|
|
virtual std::optional<BlockRef> waitTipChanged(uint256 current_tip, MillisecondsDouble timeout = MillisecondsDouble::max()) = 0;
|
|
|
|
/**
|
|
* Construct a new block template.
|
|
*
|
|
* During node initialization, this will wait until the tip is connected.
|
|
*
|
|
* @param[in] options options for creating the block
|
|
* @retval BlockTemplate a block template.
|
|
* @retval std::nullptr if the node is shut down.
|
|
*/
|
|
virtual std::unique_ptr<BlockTemplate> createNewBlock(const node::BlockCreateOptions& options = {}) = 0;
|
|
|
|
/**
|
|
* Checks if a given block is valid.
|
|
*
|
|
* @param[in] block the block to check
|
|
* @param[in] options verification options: the proof-of-work check can be
|
|
* skipped in order to verify a template generated by
|
|
* external software.
|
|
* @param[out] reason failure reason (BIP22)
|
|
* @param[out] debug more detailed rejection reason
|
|
* @returns whether the block is valid
|
|
*
|
|
* For signets the challenge verification is skipped when check_pow is false.
|
|
*/
|
|
virtual bool checkBlock(const CBlock& block, const node::BlockCheckOptions& options, std::string& reason, std::string& debug) = 0;
|
|
|
|
//! Get internal node context. Useful for RPC and testing,
|
|
//! but not accessible across processes.
|
|
virtual node::NodeContext* context() { return nullptr; }
|
|
};
|
|
|
|
//! Return implementation of Mining interface.
|
|
std::unique_ptr<Mining> MakeMining(node::NodeContext& node);
|
|
|
|
} // namespace interfaces
|
|
|
|
#endif // BITCOIN_INTERFACES_MINING_H
|