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

Merge 12455acca2 into merged_master (Bitcoin PR bitcoin/bitcoin#24470)

Browse source
This commit is contained in:
James Dorfman 2024-08-08 21:07:52 +00:00
commit 23e6602afe
18 changed files with 83 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/validation.cpp
View file

@ -1584,7 +1584,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
}
CoinsViews::CoinsViews(
std::string ldb_name,
fs::path ldb_name,
size_t cache_size_bytes,
bool in_memory,
bool should_wipe) : m_dbview(
@ -1612,7 +1612,7 @@ void CChainState::InitCoinsDB(
size_t cache_size_bytes,
bool in_memory,
bool should_wipe,
std::string leveldb_name)
fs::path leveldb_name)
{
if (m_from_snapshot_blockhash) {
leveldb_name += "_" + m_from_snapshot_blockhash->ToString();