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

refactor: Include adjustments (#4526)

Browse Source 
* include adjustments

* fix macOs build failure

Signed-off-by: pasta <pasta@dashboost.org>

* expcitly include array in spork.h

* sort includes in most files
This commit is contained in:
PastaPastaPasta 2021-10-25 09:55:34 -04:00 committed by GitHub
parent 81cc1a0a9d
commit 7b78390015
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 175 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/coinjoin/client.cpp
View File

@ -5,18 +5,19 @@
#include <coinjoin/client.h>
#include <coinjoin/options.h>
#include <chainparams.h>
#include <consensus/validation.h>
#include <core_io.h>
#include <evo/deterministicmns.h>
#include <masternode/sync.h>
#include <masternode/meta.h>
#include <netmessagemaker.h>
#include <masternode/sync.h>
#include <net_processing.h>
#include <netmessagemaker.h>
#include <script/sign.h>
#include <shutdown.h>
#include <txmempool.h>
#include <util/system.h>
#include <util/moneystr.h>
#include <util/system.h>
#include <validation.h>
#include <version.h>
#include <wallet/coincontrol.h>

21
src/coinjoin/coinjoin.cpp
View File

@ -4,21 +4,21 @@
#include <coinjoin/coinjoin.h>
#include <core_io.h>
#include <consensus/validation.h>
#include <bls/bls.h>
#include <chain.h>
#include <chainparams.h>
#include <consensus/validation.h>
#include <core_io.h>
#include <llmq/chainlocks.h>
#include <llmq/instantsend.h>
#include <masternode/node.h>
#include <masternode/sync.h>
#include <messagesigner.h>
#include <netmessagemaker.h>
#include <txmempool.h>
#include <util/system.h>
#include <util/moneystr.h>
#include <util/system.h>
#include <validation.h>
#include <bls/bls.h>
#include <masternode/node.h>
#include <masternode/sync.h>
#include <llmq/instantsend.h>
#include <llmq/chainlocks.h>
#include <string>
@ -612,3 +612,6 @@ void CCoinJoin::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock, c
UpdateDSTXConfirmedHeight(tx, -1);
}
}
int CCoinJoin::GetMinPoolParticipants() { return Params().PoolMinParticipants(); }
int CCoinJoin::GetMaxPoolParticipants() { return Params().PoolMaxParticipants(); }

7
src/coinjoin/coinjoin.h
View File

@ -5,7 +5,8 @@
#ifndef BITCOIN_COINJOIN_COINJOIN_H
#define BITCOIN_COINJOIN_COINJOIN_H
#include <chainparams.h>
#include <netaddress.h>
#include <primitives/block.h>
#include <primitives/transaction.h>
#include <sync.h>
#include <timedata.h>
@ -424,8 +425,8 @@ public:
static std::string GetMessageByID(PoolMessage nMessageID);
/// Get the minimum/maximum number of participants for the pool
static int GetMinPoolParticipants() { return Params().PoolMinParticipants(); }
static int GetMaxPoolParticipants() { return Params().PoolMaxParticipants(); }
static int GetMinPoolParticipants();
static int GetMaxPoolParticipants();
static CAmount GetMaxPoolAmount() { return vecStandardDenominations.empty() ? 0 : COINJOIN_ENTRY_MAX_SIZE * vecStandardDenominations.front(); }

1
src/dash-tx.cpp
View File

@ -6,6 +6,7 @@
#include <config/dash-config.h>
#endif
#include <chainparams.h>
#include <clientversion.h>
#include <coins.h>
#include <consensus/consensus.h>

3
src/evo/mnauth.cpp
View File

@ -4,10 +4,11 @@
#include <evo/mnauth.h>
#include <chainparams.h>
#include <evo/deterministicmns.h>
#include <llmq/utils.h>
#include <masternode/node.h>
#include <masternode/meta.h>
#include <masternode/node.h>
#include <masternode/sync.h>
#include <net.h>
#include <net_processing.h>

6
src/evo/providertx.cpp
View File

@ -2,15 +2,15 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <evo/deterministicmns.h>
#include <evo/providertx.h>
#include <evo/specialtx.h>
#include <messagesigner.h>
#include <chainparams.h>
#include <coins.h>
#include <consensus/validation.h>
#include <evo/deterministicmns.h>
#include <evo/specialtx.h>
#include <hash.h>
#include <messagesigner.h>
#include <script/standard.h>
#include <validation.h>

3
src/evo/simplifiedmns.cpp
View File

@ -2,12 +2,13 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <evo/simplifiedmns.h>
#include <evo/cbtx.h>
#include <core_io.h>
#include <evo/deterministicmns.h>
#include <llmq/blockprocessor.h>
#include <llmq/commitment.h>
#include <evo/simplifiedmns.h>
#include <evo/specialtx.h>
#include <pubkey.h>

3
src/evo/simplifiedmns.h
View File

@ -6,11 +6,12 @@
#define BITCOIN_EVO_SIMPLIFIEDMNS_H
#include <bls/bls.h>
#include <merkleblock.h>
#include <netaddress.h>
#include <pubkey.h>
class UniValue;
class CBlockIndex;
class CDeterministicMNList;
class CDeterministicMN;

5
src/evo/specialtx.cpp
View File

@ -2,16 +2,15 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <evo/specialtx.h>
#include <chainparams.h>
#include <consensus/validation.h>
#include <hash.h>
#include <primitives/block.h>
#include <validation.h>
#include <evo/cbtx.h>
#include <evo/deterministicmns.h>
#include <evo/specialtx.h>
#include <llmq/commitment.h>
#include <llmq/blockprocessor.h>

1
src/evo/specialtx.h
View File

@ -5,6 +5,7 @@
#ifndef BITCOIN_EVO_SPECIALTX_H
#define BITCOIN_EVO_SPECIALTX_H
#include <primitives/transaction.h>
#include <streams.h>
#include <sync.h>
#include <threadsafety.h>

1
src/flat-database.h
View File

@ -5,7 +5,6 @@
#ifndef BITCOIN_FLAT_DATABASE_H
#define BITCOIN_FLAT_DATABASE_H
#include <chainparams.h>
#include <clientversion.h>
#include <fs.h>
#include <hash.h>

1
src/governance/classes.cpp
View File

@ -4,6 +4,7 @@
#include <governance/classes.h>
#include <chainparams.h>
#include <core_io.h>
#include <governance/governance.h>
#include <key_io.h>

4
src/governance/governance.cpp
View File

@ -6,7 +6,9 @@
#include <bloom.h>
#include <chain.h>
#include <chainparams.h>
#include <consensus/validation.h>
#include <evo/deterministicmns.h>
#include <governance/classes.h>
#include <governance/validators.h>
#include <masternode/meta.h>
@ -18,8 +20,6 @@
#include <shutdown.h>
#include <spork.h>
#include <evo/deterministicmns.h>
CGovernanceManager governance;
int nSubmittedFinalBudget;

3
src/governance/object.cpp
View File

@ -4,10 +4,11 @@
#include <governance/object.h>
#include <chainparams.h>
#include <core_io.h>
#include <evo/deterministicmns.h>
#include <governance/validators.h>
#include <governance/governance.h>
#include <governance/validators.h>
#include <masternode/meta.h>
#include <masternode/sync.h>
#include <messagesigner.h>

1
src/governance/vote.cpp
View File

@ -5,6 +5,7 @@
#include <governance/vote.h>
#include <bls/bls.h>
#include <chainparams.h>
#include <key.h>
#include <masternode/sync.h>
#include <messagesigner.h>

1
src/key_io.cpp
View File

@ -6,6 +6,7 @@
#include <base58.h>
#include <bech32.h>
#include <chainparams.h>
#include <script/script.h>
#include <util/strencodings.h>

3
src/key_io.h
View File

@ -6,13 +6,14 @@
#ifndef BITCOIN_KEY_IO_H
#define BITCOIN_KEY_IO_H
#include <chainparams.h>
#include <key.h>
#include <pubkey.h>
#include <script/standard.h>
#include <string>
class CChainParams;
CKey DecodeSecret(const std::string& str);
std::string EncodeSecret(const CKey& key);

1
src/llmq/chainlocks.cpp
View File

@ -8,6 +8,7 @@
#include <llmq/utils.h>
#include <chain.h>
#include <chainparams.h>
#include <consensus/validation.h>
#include <masternode/sync.h>
#include <net_processing.h>

6
src/llmq/chainlocks.h
View File

@ -6,11 +6,11 @@
#define BITCOIN_LLMQ_CHAINLOCKS_H
#include <bls/bls.h>
#include <llmq/signing.h>
#include <chainparams.h>
#include <crypto/common.h>
#include <llmq/signing.h>
#include <net.h>
#include <primitives/block.h>
#include <primitives/transaction.h>
#include <saltedhasher.h>
#include <streams.h>
#include <sync.h>

1
src/llmq/dkgsession.h
View File

@ -13,6 +13,7 @@
#include <llmq/utils.h>
class UniValue;
class CInv;
namespace llmq
{

5
src/llmq/instantsend.cpp
View File

@ -2,9 +2,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <llmq/instantsend.h>
#include <llmq/chainlocks.h>
#include <llmq/quorums.h>
#include <llmq/instantsend.h>
#include <llmq/utils.h>
#include <llmq/commitment.h>
@ -21,8 +22,6 @@
#include <cxxtimer.hpp>
#include <boost/algorithm/string/replace.hpp>
namespace llmq
{

3
src/llmq/signing.cpp
View File

@ -2,9 +2,10 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <llmq/signing.h>
#include <llmq/quorums.h>
#include <llmq/commitment.h>
#include <llmq/signing.h>
#include <llmq/utils.h>
#include <llmq/signing_shares.h>

7
src/llmq/signing_shares.cpp
View File

@ -2,16 +2,17 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <llmq/signing_shares.h>
#include <llmq/quorums.h>
#include <llmq/commitment.h>
#include <llmq/signing.h>
#include <llmq/signing_shares.h>
#include <llmq/utils.h>
#include <bls/bls_batchverifier.h>
#include <chainparams.h>
#include <evo/deterministicmns.h>
#include <masternode/node.h>
#include <bls/bls_batchverifier.h>
#include <net_processing.h>
#include <netmessagemaker.h>
#include <spork.h>

6
src/llmq/signing_shares.h
View File

@ -5,7 +5,8 @@
#ifndef BITCOIN_LLMQ_SIGNING_SHARES_H
#define BITCOIN_LLMQ_SIGNING_SHARES_H
#include <chainparams.h>
#include <bls/bls.h>
#include <llmq/signing.h>
#include <net.h>
#include <random.h>
#include <saltedhasher.h>
@ -20,6 +21,9 @@
class CEvoDB;
class CScheduler;
class CDeterministicMN;
using CDeterministicMNCPtr = std::shared_ptr<const CDeterministicMN>;
namespace llmq
{
// <signHash, quorumMember>

24
src/llmq/utils.cpp
View File

@ -2,21 +2,23 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <llmq/quorums.h>
#include <llmq/commitment.h>
#include <llmq/utils.h>
#include <llmq/quorums.h>
#include <llmq/commitment.h>
#include <bls/bls.h>
#include <chainparams.h>
#include <evo/deterministicmns.h>
#include <evo/evodb.h>
#include <chainparams.h>
#include <masternode/meta.h>
#include <net.h>
#include <random.h>
#include <spork.h>
#include <timedata.h>
#include <validation.h>
#include <versionbits.h>
#include <masternode/meta.h>
namespace llmq
{
@ -397,6 +399,18 @@ std::map<Consensus::LLMQType, QvvecSyncMode> CLLMQUtils::GetEnabledQuorumVvecSyn
return mapQuorumVvecSyncEntries;
}
template <typename CacheType>
void CLLMQUtils::InitQuorumsCache(CacheType& cache)
{
for (auto& llmq : Params().GetConsensus().llmqs) {
cache.emplace(std::piecewise_construct, std::forward_as_tuple(llmq.first),
std::forward_as_tuple(llmq.second.signingActiveQuorumCount + 1));
}
}
template void CLLMQUtils::InitQuorumsCache<std::map<Consensus::LLMQType, unordered_lru_cache<uint256, bool, StaticSaltedHasher>>>(std::map<Consensus::LLMQType, unordered_lru_cache<uint256, bool, StaticSaltedHasher>>& cache);
template void CLLMQUtils::InitQuorumsCache<std::map<Consensus::LLMQType, unordered_lru_cache<uint256, std::vector<CQuorumCPtr>, StaticSaltedHasher>>>(std::map<Consensus::LLMQType, unordered_lru_cache<uint256, std::vector<CQuorumCPtr>, StaticSaltedHasher>>& cache);
template void CLLMQUtils::InitQuorumsCache<std::map<Consensus::LLMQType, unordered_lru_cache<uint256, std::shared_ptr<llmq::CQuorum>, StaticSaltedHasher, 0ul, 0ul>, std::less<Consensus::LLMQType>, std::allocator<std::pair<Consensus::LLMQType const, unordered_lru_cache<uint256, std::shared_ptr<llmq::CQuorum>, StaticSaltedHasher, 0ul, 0ul>>>>>(std::map<Consensus::LLMQType, unordered_lru_cache<uint256, std::shared_ptr<llmq::CQuorum>, StaticSaltedHasher, 0ul, 0ul>, std::less<Consensus::LLMQType>, std::allocator<std::pair<Consensus::LLMQType const, unordered_lru_cache<uint256, std::shared_ptr<llmq::CQuorum>, StaticSaltedHasher, 0ul, 0ul>>>>&);
const Consensus::LLMQParams& GetLLMQParams(Consensus::LLMQType llmqType)
{
return Params().GetConsensus().llmqs.at(llmqType);

9
src/llmq/utils.h
View File

@ -12,7 +12,6 @@
#include <random.h>
#include <sync.h>
#include <dbwrapper.h>
#include <chainparams.h>
#include <versionbits.h>
class CBlockIndex;
@ -113,13 +112,7 @@ public:
return HexStr(vBytes);
}
template <typename CacheType>
static void InitQuorumsCache(CacheType& cache)
{
for (auto& llmq : Params().GetConsensus().llmqs) {
cache.emplace(std::piecewise_construct, std::forward_as_tuple(llmq.first),
std::forward_as_tuple(llmq.second.signingActiveQuorumCount + 1));
}
}
static void InitQuorumsCache(CacheType& cache);
};
const Consensus::LLMQParams& GetLLMQParams(const Consensus::LLMQType llmqType);

1
src/masternode/node.cpp
View File

@ -6,6 +6,7 @@
#include <evo/deterministicmns.h>
#include <chainparams.h>
#include <net.h>
#include <netbase.h>
#include <protocol.h>

2
src/masternode/node.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_MASTERNODE_NODE_H
#define BITCOIN_MASTERNODE_NODE_H
#include <chainparams.h>
#include <netaddress.h>
#include <primitives/transaction.h>
#include <validationinterface.h>

19
src/masternode/payments.cpp
View File

@ -2,14 +2,21 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <evo/deterministicmns.h>
#include <governance/governance.h>
#include <governance/classes.h>
#include <masternode/node.h>
#include <masternode/payments.h>
#include <amount.h>
#include <chain.h>
#include <chainparams.h>
#include <evo/deterministicmns.h>
#include <governance/classes.h>
#include <governance/governance.h>
#include <key_io.h>
#include <logging.h>
#include <masternode/sync.h>
#include <netfulfilledman.h>
#include <netmessagemaker.h>
#include <primitives/block.h>
#include <script/standard.h>
#include <tinyformat.h>
#include <util/system.h>
#include <validation.h>
#include <string>

9
src/masternode/payments.h
View File

@ -5,7 +5,16 @@
#ifndef BITCOIN_MASTERNODE_PAYMENTS_H
#define BITCOIN_MASTERNODE_PAYMENTS_H
#include <amount.h>
#include <string>
#include <vector>
class CMasternodePayments;
class CBlock;
class CTransaction;
class CMutableTransaction;
class CTxOut;
/// TODO: all 4 functions do not belong here really, they should be refactored/moved somewhere (main.cpp ?)
bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet);

8
src/masternode/sync.cpp
View File

@ -2,14 +2,16 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <governance/governance.h>
#include <validation.h>
#include <masternode/sync.h>
#include <chainparams.h>
#include <evo/deterministicmns.h>
#include <governance/governance.h>
#include <netfulfilledman.h>
#include <netmessagemaker.h>
#include <shutdown.h>
#include <ui_interface.h>
#include <evo/deterministicmns.h>
#include <validation.h>
class CMasternodeSync;
CMasternodeSync masternodeSync;

1
src/masternode/sync.h
View File

@ -5,6 +5,7 @@
#define BITCOIN_MASTERNODE_SYNC_H
#include <atomic>
#include <string>
class CMasternodeSync;
class CBlockIndex;

1
src/qt/sendcoinsdialog.cpp
View File

@ -18,6 +18,7 @@
#include <qt/optionsmodel.h>
#include <qt/sendcoinsentry.h>
#include <chainparams.h>
#include <interfaces/node.h>
#include <key_io.h>
#include <wallet/coincontrol.h>

9
src/rpc/governance.cpp
View File

@ -2,21 +2,22 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h>
#include <consensus/validation.h>
#include <core_io.h>
#include <evo/deterministicmns.h>
#include <governance/governance.h>
#include <governance/vote.h>
#include <governance/classes.h>
#include <governance/governance.h>
#include <governance/validators.h>
#include <governance/vote.h>
#include <index/txindex.h>
#include <txmempool.h>
#include <masternode/node.h>
#include <masternode/sync.h>
#include <messagesigner.h>
#include <net.h>
#include <rpc/util.h>
#include <rpc/server.h>
#include <rpc/util.h>
#include <txmempool.h>
#include <util/system.h>
#include <validation.h>
#include <wallet/rpcwallet.h>

5
src/rpc/masternode.cpp
View File

@ -2,6 +2,7 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h>
#include <evo/deterministicmns.h>
#include <governance/classes.h>
#include <index/txindex.h>
@ -9,8 +10,9 @@
#include <masternode/payments.h>
#include <net.h>
#include <netbase.h>
#include <rpc/util.h>
#include <rpc/server.h>
#include <rpc/util.h>
#include <univalue.h>
#include <validation.h>
#include <wallet/coincontrol.h>
#include <wallet/rpcwallet.h>
@ -20,7 +22,6 @@
#include <fstream>
#include <iomanip>
#include <univalue.h>
static UniValue masternodelist(const JSONRPCRequest& request);

1
src/rpc/misc.cpp
View File

@ -5,6 +5,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chain.h>
#include <chainparams.h>
#include <clientversion.h>
#include <consensus/consensus.h>
#include <core_io.h>

1
src/rpc/rawtransaction.cpp
View File

@ -5,6 +5,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chain.h>
#include <chainparams.h>
#include <coins.h>
#include <compat/byteswap.h>
#include <consensus/validation.h>

23
src/rpc/rpcevo.cpp
View File

@ -3,12 +3,20 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <base58.h>
#include <bls/bls.h>
#include <chainparams.h>
#include <consensus/validation.h>
#include <core_io.h>
#include <evo/providertx.h>
#include <evo/deterministicmns.h>
#include <evo/simplifiedmns.h>
#include <evo/specialtx.h>
#include <index/txindex.h>
#include <masternode/meta.h>
#include <messagesigner.h>
#include <rpc/util.h>
#include <netbase.h>
#include <rpc/server.h>
#include <rpc/util.h>
#include <txmempool.h>
#include <util/moneystr.h>
#include <util/validation.h>
@ -16,21 +24,10 @@
#ifdef ENABLE_WALLET
#include <wallet/coincontrol.h>
#include <wallet/wallet.h>
#include <wallet/rpcwallet.h>
#include <wallet/wallet.h>
#endif//ENABLE_WALLET
#include <netbase.h>
#include <evo/specialtx.h>
#include <evo/providertx.h>
#include <evo/deterministicmns.h>
#include <evo/simplifiedmns.h>
#include <bls/bls.h>
#include <masternode/meta.h>
#ifdef ENABLE_WALLET
extern UniValue signrawtransaction(const JSONRPCRequest& request);
extern UniValue sendrawtransaction(const JSONRPCRequest& request);

1
src/rpc/server.cpp
View File

@ -6,6 +6,7 @@
#include <rpc/server.h>
#include <chainparams.h>
#include <fs.h>
#include <key_io.h>
#include <random.h>

9
src/spork.cpp
View File

@ -5,11 +5,18 @@
#include <spork.h>
#include <chainparams.h>
#include <consensus/params.h>
#include <key_io.h>
#include <validation.h>
#include <logging.h>
#include <messagesigner.h>
#include <net.h>
#include <net_processing.h>
#include <netmessagemaker.h>
#include <primitives/block.h>
#include <protocol.h>
#include <script/standard.h>
#include <timedata.h>
#include <validation.h>
#include <string>

32
src/spork.h
View File

@ -6,12 +6,22 @@
#define BITCOIN_SPORK_H
#include <hash.h>
#include <net.h>
#include <saltedhasher.h>
#include <util/strencodings.h>
#include <key.h>
#include <net.h>
#include <pubkey.h>
#include <saltedhasher.h>
#include <sync.h>
#include <uint256.h>
#include <array>
#include <string>
#include <string_view>
#include <unordered_map>
#include <vector>
class CConnman;
class CNode;
class CDataStream;
class CSporkMessage;
class CSporkManager;
@ -52,14 +62,14 @@ struct CSporkDef
};
#define MAKE_SPORK_DEF(name, defaultValue) CSporkDef{name, defaultValue, #name}
[[maybe_unused]] static constexpr std::array sporkDefs = {
MAKE_SPORK_DEF(SPORK_2_INSTANTSEND_ENABLED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_3_INSTANTSEND_BLOCK_FILTERING, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_9_SUPERBLOCKS_ENABLED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_17_QUORUM_DKG_ENABLED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_19_CHAINLOCKS_ENABLED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_21_QUORUM_ALL_CONNECTED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_23_QUORUM_POSE, 4070908800ULL), // OFF
[[maybe_unused]] static constexpr std::array<CSporkDef, 7> sporkDefs = {
MAKE_SPORK_DEF(SPORK_2_INSTANTSEND_ENABLED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_3_INSTANTSEND_BLOCK_FILTERING, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_9_SUPERBLOCKS_ENABLED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_17_QUORUM_DKG_ENABLED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_19_CHAINLOCKS_ENABLED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_21_QUORUM_ALL_CONNECTED, 4070908800ULL), // OFF
MAKE_SPORK_DEF(SPORK_23_QUORUM_POSE, 4070908800ULL), // OFF
};
#undef MAKE_SPORK_DEF
extern CSporkManager sporkManager;

17
src/test/evo_deterministicmns_tests.cpp
View File

@ -4,18 +4,19 @@
#include <test/test_dash.h>
#include <consensus/validation.h>
#include <script/interpreter.h>
#include <script/standard.h>
#include <script/sign.h>
#include <validation.h>
#include <base58.h>
#include <netbase.h>
#include <messagesigner.h>
#include <policy/policy.h>
#include <chainparams.h>
#include <consensus/validation.h>
#include <keystore.h>
#include <messagesigner.h>
#include <netbase.h>
#include <policy/policy.h>
#include <script/interpreter.h>
#include <script/sign.h>
#include <script/standard.h>
#include <spork.h>
#include <txmempool.h>
#include <validation.h>
#include <evo/specialtx.h>
#include <evo/providertx.h>

1
src/test/key_io_tests.cpp
View File

@ -5,6 +5,7 @@
#include <test/data/key_io_invalid.json.h>
#include <test/data/key_io_valid.json.h>
#include <chainparams.h>
#include <key.h>
#include <key_io.h>
#include <script/script.h>

1
src/wallet/rpcwallet.cpp
View File

@ -6,6 +6,7 @@
#include <amount.h>
#include <chain.h>
#include <chainparams.h>
#include <consensus/validation.h>
#include <core_io.h>
#include <httpserver.h>

1
src/wallet/wallet.cpp
View File

@ -7,6 +7,7 @@
#include <wallet/wallet.h>
#include <chain.h>
#include <chainparams.h>
#include <wallet/coinselection.h>
#include <consensus/consensus.h>
#include <consensus/validation.h>

5
test/lint/lint-circular-dependencies.sh
View File

@ -101,11 +101,10 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"evo/deterministicmns -> validationinterface -> txmempool -> evo/deterministicmns"
"llmq/chainlocks -> llmq/instantsend -> validation -> llmq/chainlocks"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> masternode/payments -> evo/deterministicmns"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> masternode/payments -> masternode/node -> evo/deterministicmns"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net -> masternode/sync -> evo/deterministicmns"
"governance/governance -> net_processing -> masternode/payments -> governance/governance"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net -> evo/deterministicmns"
"coinjoin/coinjoin -> llmq/chainlocks -> net -> coinjoin/coinjoin"
"evo/deterministicmns -> llmq/utils -> net -> evo/deterministicmns"
"evo/deterministicmns -> llmq/utils -> net -> masternode/sync -> evo/deterministicmns"
)
EXIT_CODE=0