mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-09 11:27:28 -03:00
Drop TransactionMerklePath default position arg
This commit is contained in:
parent
39d3b538e6
commit
2e81791d90
2 changed files with 3 additions and 3 deletions
|
@ -28,10 +28,10 @@ uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated = nullptr);
|
|||
* Compute merkle path to the specified transaction
|
||||
*
|
||||
* @param[in] block the block
|
||||
* @param[in] position transaction for which to calculate the merkle path, defaults to coinbase
|
||||
* @param[in] position transaction for which to calculate the merkle path (0 is the coinbase)
|
||||
*
|
||||
* @return merkle path ordered from the deepest
|
||||
*/
|
||||
std::vector<uint256> TransactionMerklePath(const CBlock& block, uint32_t position = 0);
|
||||
std::vector<uint256> TransactionMerklePath(const CBlock& block, uint32_t position);
|
||||
|
||||
#endif // BITCOIN_CONSENSUS_MERKLE_H
|
||||
|
|
|
@ -913,7 +913,7 @@ public:
|
|||
|
||||
std::vector<uint256> getCoinbaseMerklePath() override
|
||||
{
|
||||
return TransactionMerklePath(m_block_template->block);
|
||||
return TransactionMerklePath(m_block_template->block, 0);
|
||||
}
|
||||
|
||||
bool submitSolution(uint32_t version, uint32_t timestamp, uint32_t nonce, CMutableTransaction coinbase) override
|
||||
|
|
Loading…
Reference in a new issue