phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Drop TransactionMerklePath default position arg

Browse source
This commit is contained in:
Sjors Provoost 2024-10-31 11:00:12 -07:00
parent 39d3b538e6
commit 2e81791d90
No known key found for this signature in database
GPG key ID: 57FF9BDBCC301009
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/consensus/merkle.h
View file

@ -28,10 +28,10 @@ uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated = nullptr);
* Compute merkle path to the specified transaction * Compute merkle path to the specified transaction
* *
* @param[in] block the block * @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 * @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 #endif // BITCOIN_CONSENSUS_MERKLE_H

2
src/node/interfaces.cpp
View file

@ -913,7 +913,7 @@ public:
std::vector<uint256> getCoinbaseMerklePath() override 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 bool submitSolution(uint32_t version, uint32_t timestamp, uint32_t nonce, CMutableTransaction coinbase) override