sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #15531: Suggested interfaces::Chain cleanups from #15288

Browse Source 
4d4e4c6448 Suggested interfaces::Chain cleanups from #15288 (Russell Yanofsky)

Pull request description:

  Mostly documentation improvements requested in the last review of #15288 before it was merged (https://github.com/bitcoin/bitcoin/pull/15288#pullrequestreview-210241864)

Tree-SHA512: 64e912520bbec20a44032f265a8cf3f11ad7f5126c8626b5ad5e888227b1f92ecb321522fab4bbbd613230b55450abd6ace023631d0a4f357a780d65c5638bfe
This commit is contained in:
MarcoFalke 2019-03-05 09:19:21 -05:00 committed by Munkybooty
parent 10e5ed2d5e
commit 48825dbfd3
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/README.md
View File

@ -2,9 +2,9 @@
The following interfaces are defined here: The following interfaces are defined here:
* [`Chain`](chain.h) — used by wallet to access blockchain and mempool state. Added in [#10973](https://github.com/bitcoin/bitcoin/pull/10973). * [`Chain`](chain.h) — used by wallet to access blockchain and mempool state. Added in [#14437](https://github.com/bitcoin/bitcoin/pull/14437), [#14711](https://github.com/bitcoin/bitcoin/pull/14711), [#15288](https://github.com/bitcoin/bitcoin/pull/15288), and [#10973](https://github.com/bitcoin/bitcoin/pull/10973).
* [`ChainClient`](chain.h) — used by node to start & stop `Chain` clients. Added in [#10973](https://github.com/bitcoin/bitcoin/pull/10973). * [`ChainClient`](chain.h) — used by node to start & stop `Chain` clients. Added in [#14437](https://github.com/bitcoin/bitcoin/pull/14437).
* [`Node`](node.h) — used by GUI to start & stop bitcoin node. Added in [#10244](https://github.com/bitcoin/bitcoin/pull/10244). * [`Node`](node.h) — used by GUI to start & stop bitcoin node. Added in [#10244](https://github.com/bitcoin/bitcoin/pull/10244).

8
src/interfaces/chain.cpp
View File

@ -170,7 +170,7 @@ class LockImpl : public Chain::Lock
LockAnnotation lock(::cs_main); LockAnnotation lock(::cs_main);
return CheckFinalTx(tx); return CheckFinalTx(tx);
} }
bool submitToMemoryPool(CTransactionRef tx, CAmount absurd_fee, CValidationState& state) override bool submitToMemoryPool(const CTransactionRef& tx, CAmount absurd_fee, CValidationState& state) override
{ {
LockAnnotation lock(::cs_main); LockAnnotation lock(::cs_main);
return AcceptToMemoryPool(::mempool, state, tx, nullptr /* missing inputs */, return AcceptToMemoryPool(::mempool, state, tx, nullptr /* missing inputs */,
@ -321,8 +321,8 @@ public:
bool hasDescendantsInMempool(const uint256& txid) override bool hasDescendantsInMempool(const uint256& txid) override
{ {
LOCK(::mempool.cs); LOCK(::mempool.cs);
auto it_mp = ::mempool.mapTx.find(txid); auto it = ::mempool.GetIter(txid);
return it_mp != ::mempool.mapTx.end() && it_mp->GetCountWithDescendants() > 1; return it && (*it)->GetCountWithDescendants() > 1;
} }
void relayTransaction(const uint256& txid) override void relayTransaction(const uint256& txid) override
{ {
@ -333,7 +333,7 @@ public:
{ {
::mempool.GetTransactionAncestry(txid, ancestors, descendants); ::mempool.GetTransactionAncestry(txid, ancestors, descendants);
} }
bool checkChainLimits(CTransactionRef tx) override bool checkChainLimits(const CTransactionRef& tx) override
{ {
LockPoints lp; LockPoints lp;
CTxMemPoolEntry entry(tx, 0, 0, 0, false, 0, lp); CTxMemPoolEntry entry(tx, 0, 0, 0, false, 0, lp);

36
src/interfaces/chain.h
View File

@ -15,6 +15,7 @@
#include <vector> #include <vector>
class CBlock; class CBlock;
class CFeeRate;
class CRPCCommand; class CRPCCommand;
class CScheduler; class CScheduler;
class CValidationState; class CValidationState;
@ -38,7 +39,27 @@ namespace interfaces {
class Wallet; class Wallet;
class Handler; class Handler;
//! Interface for giving wallet processes access to blockchain state. //! Interface giving clients (wallet processes, maybe other analysis tools in
//! the future) ability to access to the chain state, receive notifications,
//! estimate fees, and submit transactions.
//!
//! TODO: Current chain methods are too low level, exposing too much of the
//! internal workings of the bitcoin node, and not being very convenient to use.
//! Chain methods should be cleaned up and simplified over time. Examples:
//!
//! * The Chain::lock() method, which lets clients delay chain tip updates
//! should be removed when clients are able to respond to updates
//! asynchronously
//! (https://github.com/bitcoin/bitcoin/pull/10973#issuecomment-380101269).
//!
//! * The relayTransactions() and submitToMemoryPool() methods could be replaced
//! with a higher-level broadcastTransaction method
//! (https://github.com/bitcoin/bitcoin/pull/14978#issuecomment-459373984).
//!
//! * The initMessages() and loadWallet() methods which the wallet uses to send
//! notifications to the GUI should go away when GUI and wallet can directly
//! communicate with each other without going through the node
//! (https://github.com/bitcoin/bitcoin/pull/15288#discussion_r253321096).
class Chain class Chain
{ {
public: public:
@ -126,8 +147,9 @@ public:
virtual bool checkFinalTx(const CTransaction& tx) = 0; virtual bool checkFinalTx(const CTransaction& tx) = 0;
//! Add transaction to memory pool if the transaction fee is below the //! Add transaction to memory pool if the transaction fee is below the
//! amount specified by absurd_fee (as a safeguard). */ //! amount specified by absurd_fee. Returns false if the transaction
virtual bool submitToMemoryPool(CTransactionRef tx, CAmount absurd_fee, CValidationState& state) = 0; //! could not be added due to the fee or for another reason.
virtual bool submitToMemoryPool(const CTransactionRef& tx, CAmount absurd_fee, CValidationState& state) = 0;
}; };
//! Return Lock interface. Chain is locked when this is called, and //! Return Lock interface. Chain is locked when this is called, and
@ -168,8 +190,8 @@ public:
//! Calculate mempool ancestor and descendant counts for the given transaction. //! Calculate mempool ancestor and descendant counts for the given transaction.
virtual void getTransactionAncestry(const uint256& txid, size_t& ancestors, size_t& descendants) = 0; virtual void getTransactionAncestry(const uint256& txid, size_t& ancestors, size_t& descendants) = 0;
//! Check chain limits. //! Check if transaction will pass the mempool's chain limits.
virtual bool checkChainLimits(CTransactionRef tx) = 0; virtual bool checkChainLimits(const CTransactionRef& tx) = 0;
//! Estimate smart fee. //! Estimate smart fee.
virtual CFeeRate estimateSmartFee(int num_blocks, bool conservative, FeeCalculation* calc = nullptr) = 0; virtual CFeeRate estimateSmartFee(int num_blocks, bool conservative, FeeCalculation* calc = nullptr) = 0;
@ -177,7 +199,7 @@ public:
//! Fee estimator max target. //! Fee estimator max target.
virtual unsigned int estimateMaxBlocks() = 0; virtual unsigned int estimateMaxBlocks() = 0;
//! Pool min fee. //! Mempool minimum fee.
virtual CFeeRate mempoolMinFee() = 0; virtual CFeeRate mempoolMinFee() = 0;
//! Relay current minimum fee (from -minrelaytxfee and -incrementalrelayfee settings). //! Relay current minimum fee (from -minrelaytxfee and -incrementalrelayfee settings).
@ -189,7 +211,7 @@ public:
//! Relay dust fee setting (-dustrelayfee), reflecting lowest rate it's economical to spend. //! Relay dust fee setting (-dustrelayfee), reflecting lowest rate it's economical to spend.
virtual CFeeRate relayDustFee() = 0; virtual CFeeRate relayDustFee() = 0;
//! Get node max tx fee setting (-maxtxfee). //! Node max tx fee setting (-maxtxfee).
//! This could be replaced by a per-wallet max fee, as proposed at //! This could be replaced by a per-wallet max fee, as proposed at
//! https://github.com/bitcoin/bitcoin/issues/15355 //! https://github.com/bitcoin/bitcoin/issues/15355
//! But for the time being, wallets call this to access the node setting. //! But for the time being, wallets call this to access the node setting.