From fa607c229295e0f0b89d5177b94d3381ab5e37d8 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 24 Sep 2019 11:18:17 -0400 Subject: [PATCH] validation: Make GetWitnessCommitmentIndex public --- src/validation.cpp | 4 +--- src/validation.h | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index 4caee52424..1e7b9c7e68 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3280,9 +3280,7 @@ bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& pa return (height >= params.SegwitHeight); } -// Compute at which vout of the block's coinbase transaction the witness -// commitment occurs, or -1 if not found. -static int GetWitnessCommitmentIndex(const CBlock& block) +int GetWitnessCommitmentIndex(const CBlock& block) { int commitpos = -1; if (!block.vtx.empty()) { diff --git a/src/validation.h b/src/validation.h index 615b83f028..96d249b6d3 100644 --- a/src/validation.h +++ b/src/validation.h @@ -384,6 +384,9 @@ bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& pa /** When there are blocks in the active chain with missing data, rewind the chainstate and remove them from the block index */ bool RewindBlockIndex(const CChainParams& params) LOCKS_EXCLUDED(cs_main); +/** Compute at which vout of the block's coinbase transaction the witness commitment occurs, or -1 if not found */ +int GetWitnessCommitmentIndex(const CBlock& block); + /** Update uncommitted block structures (currently: only the witness reserved value). This is safe for submitted blocks. */ void UpdateUncommittedBlockStructures(CBlock& block, const CBlockIndex* pindexPrev, const Consensus::Params& consensusParams);