sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Still pass the disconect block index

Browse Source
This commit is contained in:
UdjinM6 2019-09-07 23:16:59 +03:00 committed by Pasta
parent 6dce8d2736
commit a80f42eabd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/validation.cpp
View File

@ -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;
}

6
src/validationinterface.cpp
View File

@ -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) {

2
src/validationinterface.h
View File

@ -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);