From a80f42eabd884c8c140694fe0c0169cd9c8d1b7d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 7 Sep 2019 23:16:59 +0300
Subject: [PATCH] Still pass the disconect block index

---
 src/validation.cpp          | 2 +-
 src/validationinterface.cpp | 6 +++---
 src/validationinterface.h   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index e9e9a20dc..cc2acd037 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2350,7 +2350,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     UpdateTip(pindexDelete->pprev, chainparams);
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
-    GetMainSignals().BlockDisconnected(pblock);
+    GetMainSignals().BlockDisconnected(pblock, pindexDelete);
     return true;
 }
 
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 542c0cf66..f36a72923 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -18,7 +18,7 @@ struct MainSignalsInstance {
     boost::signals2::signal<void (const CBlockIndex *, const CBlockIndex *, bool fInitialDownload)> UpdatedBlockTip;
     boost::signals2::signal<void (const CTransactionRef &)> TransactionAddedToMempool;
     boost::signals2::signal<void (const std::shared_ptr<const CBlock> &, const CBlockIndex *pindex, const std::vector<CTransactionRef>&)> BlockConnected;
-    boost::signals2::signal<void (const std::shared_ptr<const CBlock> &)> BlockDisconnected;
+    boost::signals2::signal<void (const std::shared_ptr<const CBlock> &, const CBlockIndex* pindexDisconnected)> BlockDisconnected;
     boost::signals2::signal<void (const CBlockLocator &)> SetBestChain;
     boost::signals2::signal<void (const uint256 &)> Inventory;
     boost::signals2::signal<void (int64_t nBestBlockTime, CConnman* connman)> Broadcast;
@@ -132,8 +132,8 @@ void CMainSignals::BlockConnected(const std::shared_ptr<const CBlock> &pblock, c
     m_internals->BlockConnected(pblock, pindex, vtxConflicted);
 }
 
-void CMainSignals::BlockDisconnected(const std::shared_ptr<const CBlock> &pblock) {
-    m_internals->BlockDisconnected(pblock);
+void CMainSignals::BlockDisconnected(const std::shared_ptr<const CBlock> &pblock, const CBlockIndex* pindexDisconnected) {
+    m_internals->BlockDisconnected(pblock, pindexDisconnected);
 }
 
 void CMainSignals::SetBestChain(const CBlockLocator &locator) {
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 89aba7ea9..b56e8e748 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -103,7 +103,7 @@ public:
     void UpdatedBlockTip(const CBlockIndex *, const CBlockIndex *, bool fInitialDownload);
     void TransactionAddedToMempool(const CTransactionRef &);
     void BlockConnected(const std::shared_ptr<const CBlock> &, const CBlockIndex *pindex, const std::vector<CTransactionRef> &);
-    void BlockDisconnected(const std::shared_ptr<const CBlock> &);
+    void BlockDisconnected(const std::shared_ptr<const CBlock> &, const CBlockIndex* pindexDisconnected);
     void NotifyTransactionLock(const CTransaction &tx, const llmq::CInstantSendLock& islock);
     void NotifyChainLock(const CBlockIndex* pindex, const llmq::CChainLockSig& clsig);
     void NotifyGovernanceVote(const CGovernanceVote &vote);