mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-25 21:39:05 +01:00
Merge bitcoin/bitcoin#30409: Introduce waitTipChanged() mining interface, replace RPCNotifyBlockChange, drop CRPCSignals & g_best_block
7942951e3fRemove unused g_best_block (Ryan Ofsky)e3a560ca68rpc: use waitTipChanged for longpoll (Ryan Ofsky)460687a09cRemove unused CRPCSignals (Sjors Provoost)dca923150eReplace RPCNotifyBlockChange with waitTipChanged() (Sjors Provoost)2a40ee1121rpc: check for negative timeout arg in waitfor* (Sjors Provoost)de7c855b3arpc: recommend -rpcclienttimeout=0 for waitfor* (Sjors Provoost)77ec072925rpc: fix waitfornewblock description (Sjors Provoost)285fe9fb51rpc: add test for waitforblock and waitfornewblock (Sjors Provoost)b94b27cf05Add waitTipChanged to Mining interface (Sjors Provoost)7eccdaf160node: Track last block that received a blockTip notification (Sjors Provoost)ebb8215f23Rename getTipHash() to getTip() and return BlockRef (Sjors Provoost)89a8f74bbbrefactor: rename BlockKey to BlockRef (Sjors Provoost) Pull request description: This continues the work in #30200 so that a future Stratum v2 Template Provider (see #29432) can avoid accessing node internals. It needs to know when a new block arrives in order to push new templates to connected clients. `waitTipChanged()` uses a new kernel notification `notifications().m_tip_block_mutex`, which this PR also introduces (a previous version used `g_best_block`). In order to ensure the new method works as intended, the `waitfornewblock`, `waitforblock` and `waitforblockheight` RPC methods are refactored to use it. This allows removing `RPCNotifyBlockChange`. There's a commit to add (direct) tests for the methods that are about to be refactored: - `waitfornewblock` was already implicitly tested by `feature_shutdown.py`. - `waitforblockheight` by `feature_coinstatsindex.py` and `example_test.py` This PR renames `getTipHash()` to `getTip()` and returns a `BlockRef` (renamed from `BlockKey`) so that callers can use either the height or hash. The later commits make trivial improvements to the `waitfor*` RPC calls (not needed for this PR). The `waitTipChanged()` method could probably also be used for the longpoll functionality in `getblocktemplate`, but I'm a bit reluctant to touch that. `RPCServer::OnStarted` no longer does anything and `RPCServer::OnStopped` merely prints a log statement. They were added in #5711 as a refactor. This PR drops them entirely. Finally `g_best_block` is also dropped. ACKs for top commit: achow101: ACK7942951e3fryanofsky: Code review ACK7942951e3f. Just rebased since last review TheCharlatan: Re-ACK7942951e3fTree-SHA512: a5559446b4000c95e07aad33284b7ee2e57aafd87e1ae778b3825d59689566d047a8047e47a10f76e6e341e7dc72fd265a65afbc0a9c011d17c4cafd55031837
This commit is contained in:
@@ -41,12 +41,6 @@ namespace interfaces {
|
||||
class Handler;
|
||||
class Wallet;
|
||||
|
||||
//! Hash/height pair to help track and identify blocks.
|
||||
struct BlockKey {
|
||||
uint256 hash;
|
||||
int height = -1;
|
||||
};
|
||||
|
||||
//! Helper for findBlock to selectively return pieces of block data. If block is
|
||||
//! found, data will be returned by setting specified output variables. If block
|
||||
//! is not found, output variables will keep their previous values.
|
||||
|
||||
@@ -6,11 +6,13 @@
|
||||
#define BITCOIN_INTERFACES_MINING_H
|
||||
|
||||
#include <consensus/amount.h> // for CAmount
|
||||
#include <interfaces/types.h> // for BlockRef
|
||||
#include <node/types.h> // for BlockCreateOptions
|
||||
#include <primitives/block.h> // for CBlock, CBlockHeader
|
||||
#include <primitives/transaction.h> // for CTransactionRef
|
||||
#include <stdint.h> // for int64_t
|
||||
#include <uint256.h> // for uint256
|
||||
#include <util/time.h> // for MillisecondsDouble
|
||||
|
||||
#include <memory> // for unique_ptr, shared_ptr
|
||||
#include <optional> // for optional
|
||||
@@ -55,10 +57,21 @@ public:
|
||||
//! Returns whether IBD is still in progress.
|
||||
virtual bool isInitialBlockDownload() = 0;
|
||||
|
||||
//! Returns the hash for the tip of this chain
|
||||
virtual std::optional<uint256> getTipHash() = 0;
|
||||
//! Returns the hash and height for the tip of this chain
|
||||
virtual std::optional<BlockRef> getTip() = 0;
|
||||
|
||||
/**
|
||||
* Waits for the tip to change
|
||||
*
|
||||
* @param[in] current_tip block hash of the current chain tip. Function waits
|
||||
* for the chain tip to change if this matches, otherwise
|
||||
* it returns right away.
|
||||
* @param[in] timeout how long to wait for a new tip
|
||||
* @returns Hash and height of the current chain tip after this call.
|
||||
*/
|
||||
virtual BlockRef waitTipChanged(uint256 current_tip, MillisecondsDouble timeout = MillisecondsDouble::max()) = 0;
|
||||
|
||||
/**
|
||||
* Construct a new block template
|
||||
*
|
||||
* @param[in] script_pub_key the coinbase output
|
||||
|
||||
20
src/interfaces/types.h
Normal file
20
src/interfaces/types.h
Normal file
@@ -0,0 +1,20 @@
|
||||
// Copyright (c) 2024 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_TYPES_H
|
||||
#define BITCOIN_INTERFACES_TYPES_H
|
||||
|
||||
#include <uint256.h>
|
||||
|
||||
namespace interfaces {
|
||||
|
||||
//! Hash/height pair to help track and identify blocks.
|
||||
struct BlockRef {
|
||||
uint256 hash;
|
||||
int height = -1;
|
||||
};
|
||||
|
||||
} // namespace interfaces
|
||||
|
||||
#endif // BITCOIN_INTERFACES_TYPES_H
|
||||
Reference in New Issue
Block a user