From a42b90b7eab206bb143e125b0d6b0fcf47b3ff0d Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 6 Jun 2026 11:54:00 -0500
Subject: [PATCH] fix: repair dash-chainstate dist sources

---
 src/Makefile.am            | 9 ++++-----
 src/bitcoin-chainstate.cpp | 9 +--------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4667cba7aa88..5137d940baef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1165,7 +1165,8 @@ dash_util_LDADD += $(BOOST_LIBS)
 # dash-chainstate binary #
 dash_chainstate_SOURCES = \
   bitcoin-chainstate.cpp \
-  addressindex.cpp \
+  index/addressindex.cpp \
+  index/addressindex_util.cpp \
   arith_uint256.cpp \
   base58.cpp \
   batchedlogger.cpp \
@@ -1206,12 +1207,9 @@ dash_chainstate_SOURCES = \
   evo/specialtxman.cpp \
   flatfile.cpp \
   fs.cpp \
-  governance/classes.cpp \
   governance/common.cpp \
-  governance/exceptions.cpp \
-  governance/governance.cpp \
   governance/object.cpp \
-  governance/validators.cpp \
+  governance/superblock.cpp \
   governance/vote.cpp \
   governance/votedb.cpp \
   gsl/assert.cpp \
@@ -1219,6 +1217,7 @@ dash_chainstate_SOURCES = \
   index/base.cpp \
   index/blockfilterindex.cpp \
   index/coinstatsindex.cpp \
+  index/spentindex.cpp \
   index/txindex.cpp \
   instantsend/db.cpp \
   instantsend/instantsend.cpp \
diff --git a/src/bitcoin-chainstate.cpp b/src/bitcoin-chainstate.cpp
index bdb804a3ec36..d9a4a4d0ace1 100644
--- a/src/bitcoin-chainstate.cpp
+++ b/src/bitcoin-chainstate.cpp
@@ -18,7 +18,6 @@
 #include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
-#include <governance/governance.h>
 #include <init/common.h>
 #include <llmq/context.h>
 #include <masternode/meta.h>
@@ -119,9 +118,6 @@ int main(int argc, char* argv[])
     std::unique_ptr<CEvoDB> evodb;
     std::unique_ptr<CDeterministicMNManager> dmnman;
     CMasternodeSync mn_sync{std::make_unique<NullNodeSyncNotifier>()};
-    // govman captures dmnman by const-ref; the unique_ptr is empty here and
-    // filled later inside DashChainstateSetup (called by LoadChainstate).
-    CGovernanceManager govman(metaman, chainman, dmnman, mn_sync);
     CSporkManager sporkman;
     chainlock::Chainlocks chainlocks(sporkman);
 
@@ -129,10 +125,10 @@ int main(int argc, char* argv[])
     std::unique_ptr<CChainstateHelper> chain_helper;
     auto rv = node::LoadChainstate(/*fReset=*/false,
                                    std::ref(chainman),
-                                   govman,
                                    metaman,
                                    sporkman,
                                    chainlocks,
+                                   mn_sync,
                                    chain_helper,
                                    dmnman,
                                    evodb,
@@ -140,9 +136,6 @@ int main(int argc, char* argv[])
                                    /*mempool=*/nullptr,
                                    gArgs.GetDataDirNet(),
                                    /*fPruneMode=*/false,
-                                   /*is_addrindex_enabled=*/false,
-                                   /*is_spentindex_enabled=*/false,
-                                   /*is_timeindex_enabled=*/false,
                                    chainparams.GetConsensus(),
                                    /*fReindexChainState=*/false,
                                    2 << 20,