Skip to content

Commit 317917a

Browse files
Merge #7341: fix: repair dash-chainstate dist sources
a42b90b fix: repair dash-chainstate dist sources (pasta) Pull request description: ## Issue being fixed or feature implemented The `make distdir` and `dash-chainstate` packaging/build paths referenced stale source paths after recent address index and governance refactors. This caused CI packaging/build jobs using `--enable-experimental-util-chainstate` to fail. ## What was done? - Updated `dash_chainstate_SOURCES` to use `index/addressindex.cpp` and include its standalone helper/source dependencies. - Replaced removed governance source entries with the current governance source files used by the tree. - Updated `bitcoin-chainstate.cpp` to match the current `LoadChainstate` setup flow after the governance/superblock manager refactor. ## How Has This Been Tested? - `./configure --enable-experimental-util-chainstate` - `make -C src -j4 dash-chainstate` - `git diff --check` - `rm -rf dashcore-distcheck-test && mkdir dashcore-distcheck-test && (cd src && make top_distdir=../dashcore-distcheck-test distdir=../dashcore-distcheck-test/src am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)` ## Breaking Changes None. ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone This pull request was created by Codex. ACKs for top commit: UdjinM6: utACK a42b90b Tree-SHA512: 1ba10a8650595991397b43e8f47fb19f455d5bb58b8cdad4303bf783636a0f8901e339c10dd95dbe613381d962fa396539bca92d136d5fdc13a727321a312570
2 parents 5af9f57 + a42b90b commit 317917a

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

src/Makefile.am

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,8 @@ dash_util_LDADD += $(BOOST_LIBS)
11651165
# dash-chainstate binary #
11661166
dash_chainstate_SOURCES = \
11671167
bitcoin-chainstate.cpp \
1168-
addressindex.cpp \
1168+
index/addressindex.cpp \
1169+
index/addressindex_util.cpp \
11691170
arith_uint256.cpp \
11701171
base58.cpp \
11711172
batchedlogger.cpp \
@@ -1206,19 +1207,17 @@ dash_chainstate_SOURCES = \
12061207
evo/specialtxman.cpp \
12071208
flatfile.cpp \
12081209
fs.cpp \
1209-
governance/classes.cpp \
12101210
governance/common.cpp \
1211-
governance/exceptions.cpp \
1212-
governance/governance.cpp \
12131211
governance/object.cpp \
1214-
governance/validators.cpp \
1212+
governance/superblock.cpp \
12151213
governance/vote.cpp \
12161214
governance/votedb.cpp \
12171215
gsl/assert.cpp \
12181216
hash.cpp \
12191217
index/base.cpp \
12201218
index/blockfilterindex.cpp \
12211219
index/coinstatsindex.cpp \
1220+
index/spentindex.cpp \
12221221
index/txindex.cpp \
12231222
instantsend/db.cpp \
12241223
instantsend/instantsend.cpp \

src/bitcoin-chainstate.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <evo/chainhelper.h>
1919
#include <evo/deterministicmns.h>
2020
#include <evo/evodb.h>
21-
#include <governance/governance.h>
2221
#include <init/common.h>
2322
#include <llmq/context.h>
2423
#include <masternode/meta.h>
@@ -119,30 +118,24 @@ int main(int argc, char* argv[])
119118
std::unique_ptr<CEvoDB> evodb;
120119
std::unique_ptr<CDeterministicMNManager> dmnman;
121120
CMasternodeSync mn_sync{std::make_unique<NullNodeSyncNotifier>()};
122-
// govman captures dmnman by const-ref; the unique_ptr is empty here and
123-
// filled later inside DashChainstateSetup (called by LoadChainstate).
124-
CGovernanceManager govman(metaman, chainman, dmnman, mn_sync);
125121
CSporkManager sporkman;
126122
chainlock::Chainlocks chainlocks(sporkman);
127123

128124
std::unique_ptr<LLMQContext> llmq_ctx;
129125
std::unique_ptr<CChainstateHelper> chain_helper;
130126
auto rv = node::LoadChainstate(/*fReset=*/false,
131127
std::ref(chainman),
132-
govman,
133128
metaman,
134129
sporkman,
135130
chainlocks,
131+
mn_sync,
136132
chain_helper,
137133
dmnman,
138134
evodb,
139135
llmq_ctx,
140136
/*mempool=*/nullptr,
141137
gArgs.GetDataDirNet(),
142138
/*fPruneMode=*/false,
143-
/*is_addrindex_enabled=*/false,
144-
/*is_spentindex_enabled=*/false,
145-
/*is_timeindex_enabled=*/false,
146139
chainparams.GetConsensus(),
147140
/*fReindexChainState=*/false,
148141
2 << 20,

0 commit comments

Comments
 (0)