GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

validation: add CChainState.m_from_snapshot_blockhash

Browse source 
This parameter is unused, but in future commits will allow ChainstateManager to
differentiate between chainstates created from a UTXO snapshot from those that
weren't.
This commit is contained in:
James O'Beirne 2019-12-11 16:41:40 -05:00 • committed by James O'Beirne
parent d2d0a04a66
commit 8e2ecfe249
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/validation.cpp
View file

@ -1244,7 +1244,9 @@ void CoinsViews::InitCache()
// NOTE: for now m_blockman is set to a global, but this will be changed // NOTE: for now m_blockman is set to a global, but this will be changed
// in a future commit. // in a future commit.
CChainState::CChainState() : m_blockman(g_blockman) {} CChainState::CChainState(uint256 from_snapshot_blockhash)
: m_blockman(g_blockman),
m_from_snapshot_blockhash(from_snapshot_blockhash) {}
void CChainState::InitCoinsDB( void CChainState::InitCoinsDB(
@ -1253,6 +1255,10 @@ void CChainState::InitCoinsDB(
bool should_wipe, bool should_wipe,
std::string leveldb_name) std::string leveldb_name)
{ {
if (!m_from_snapshot_blockhash.IsNull()) {
leveldb_name += "_" + m_from_snapshot_blockhash.ToString();
}
m_coins_views = MakeUnique<CoinsViews>( m_coins_views = MakeUnique<CoinsViews>(
leveldb_name, cache_size_bytes, in_memory, should_wipe); leveldb_name, cache_size_bytes, in_memory, should_wipe);
} }

11
src/validation.h
View file

@ -591,8 +591,8 @@ private:
std::unique_ptr<CoinsViews> m_coins_views; std::unique_ptr<CoinsViews> m_coins_views;
public: public:
CChainState(BlockManager& blockman) : m_blockman(blockman) {} explicit CChainState(BlockManager& blockman) : m_blockman(blockman) {}
CChainState(); explicit CChainState(uint256 from_snapshot_blockhash = uint256());
/** /**
* Initialize the CoinsViews UTXO set database management data structures. The in-memory * Initialize the CoinsViews UTXO set database management data structures. The in-memory
@ -620,6 +620,13 @@ public:
//! @see CChain, CBlockIndex. //! @see CChain, CBlockIndex.
CChain m_chain; CChain m_chain;
/**
* The blockhash which is the base of the snapshot this chainstate was created from.
*
* IsNull() if this chainstate was not created from a snapshot.
*/
const uint256 m_from_snapshot_blockhash{};
/** /**
* The set of all CBlockIndex entries with BLOCK_VALID_TRANSACTIONS (for itself and all ancestors) and * The set of all CBlockIndex entries with BLOCK_VALID_TRANSACTIONS (for itself and all ancestors) and
* as good as our current tip or better. Entries may be failed, though, and pruning nodes may be * as good as our current tip or better. Entries may be failed, though, and pruning nodes may be