Backport 11651 (#3358)

* scripted-diff: Replace #include "" with #include <> (ryanofsky)

-BEGIN VERIFY SCRIPT-
for f in \
  src/*.cpp \
  src/*.h \
  src/bench/*.cpp \
  src/bench/*.h \
  src/compat/*.cpp \
  src/compat/*.h \
  src/consensus/*.cpp \
  src/consensus/*.h \
  src/crypto/*.cpp \
  src/crypto/*.h \
  src/crypto/ctaes/*.h \
  src/policy/*.cpp \
  src/policy/*.h \
  src/primitives/*.cpp \
  src/primitives/*.h \
  src/qt/*.cpp \
  src/qt/*.h \
  src/qt/test/*.cpp \
  src/qt/test/*.h \
  src/rpc/*.cpp \
  src/rpc/*.h \
  src/script/*.cpp \
  src/script/*.h \
  src/support/*.cpp \
  src/support/*.h \
  src/support/allocators/*.h \
  src/test/*.cpp \
  src/test/*.h \
  src/wallet/*.cpp \
  src/wallet/*.h \
  src/wallet/test/*.cpp \
  src/wallet/test/*.h \
  src/zmq/*.cpp \
  src/zmq/*.h
do
  base=${f%/*}/ relbase=${base#src/} sed -i "s:#include \"\(.*\)\"\(.*\):if test -e \$base'\\1'; then echo \"#include <\"\$relbase\"\\1>\\2\"; else echo \"#include <\\1>\\2\"; fi:e" $f
done
-END VERIFY SCRIPT-

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

* scripted-diff: Replace #include "" with #include <> (Dash Specific)

-BEGIN VERIFY SCRIPT-
for f in \
  src/bls/*.cpp \
  src/bls/*.h \
  src/evo/*.cpp \
  src/evo/*.h \
  src/governance/*.cpp \
  src/governance/*.h \
  src/llmq/*.cpp \
  src/llmq/*.h \
  src/masternode/*.cpp \
  src/masternode/*.h \
  src/privatesend/*.cpp \
  src/privatesend/*.h
do
  base=${f%/*}/ relbase=${base#src/} sed -i "s:#include \"\(.*\)\"\(.*\):if test -e \$base'\\1'; then echo \"#include <\"\$relbase\"\\1>\\2\"; else echo \"#include <\\1>\\2\"; fi:e" $f
done
-END VERIFY SCRIPT-

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

* build: Remove -I for everything but project root

Remove -I from build system for everything but the project root,
and built-in dependencies.

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

# Conflicts:
#	src/Makefile.test.include

* qt: refactor: Use absolute include paths in .ui files

* qt: refactor: Changes to make include paths absolute

This makes all include paths in the GUI absolute.

Many changes are involved as every single source file in
src/qt/ assumes to be able to use relative includes.

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

# Conflicts:
#	src/qt/dash.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/test/rpcnestedtests.cpp

* test: refactor: Use absolute include paths for test data files

* Recommend #include<> syntax in developer notes

* refactor: Include obj/build.h instead of build.h

* END BACKPORT #11651 Remove trailing whitespace causing travis failure

* fix backport 11651

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

* More of 11651

* fix blockchain.cpp

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

* Add missing "qt/" in includes

* Add missing "test/" in includes

* Fix trailing whitespaces

Co-authored-by: Wladimir J. van der Laan <laanwj@gmail.com>
Co-authored-by: Russell Yanofsky <russ@yanofsky.org>
Co-authored-by: MeshCollider <dobsonsa68@gmail.com>
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
This commit is contained in:
PastaPastaPasta 2020-03-19 22:46:56 +00:00 committed by GitHub
parent 05c134c783
commit 8a1ec935a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
509 changed files with 2944 additions and 2937 deletions

View File

@ -503,6 +503,14 @@ namespace {
- *Rationale*: Avoids confusion about the namespace context
- Prefer `#include <primitives/transaction.h>` bracket syntax instead of
`#include "primitives/transactions.h"`` quote syntax when possible.
- *Rationale*: Bracket syntax is less ambiguous because the preprocessor
searches a fixed list of include directories without taking location of the
source file into account. This allows quoted includes to stand out more when
the location of the source file actually is relevant.
GUI
-----

View File

@ -37,7 +37,7 @@ else
LIBUNIVALUE = $(UNIVALUE_LIBS)
endif
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)

View File

@ -325,8 +325,7 @@ RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
BITCOIN_RC = qt/res/dash-qt-res.rc
BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \
-I$(builddir)/qt/forms -DQT_NO_KEYWORDS
BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS
qt_libdashqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
$(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)

View File

@ -110,7 +110,7 @@ BITCOIN_TESTS += \
endif
test_test_dash_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
test_test_dash_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS)
test_test_dash_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(TESTDEFS) $(EVENT_CFLAGS)
test_test_dash_LDADD =
if ENABLE_WALLET
test_test_dash_LDADD += $(LIBBITCOIN_WALLET)

View File

@ -3,17 +3,17 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "addrdb.h"
#include <addrdb.h>
#include "addrman.h"
#include "chainparams.h"
#include "clientversion.h"
#include "fs.h"
#include "hash.h"
#include "random.h"
#include "streams.h"
#include "tinyformat.h"
#include "util.h"
#include <addrman.h>
#include <chainparams.h>
#include <clientversion.h>
#include <fs.h>
#include <hash.h>
#include <random.h>
#include <streams.h>
#include <tinyformat.h>
#include <util.h>
namespace {

View File

@ -6,8 +6,8 @@
#ifndef BITCOIN_ADDRDB_H
#define BITCOIN_ADDRDB_H
#include "fs.h"
#include "serialize.h"
#include <fs.h>
#include <serialize.h>
#include <string>
#include <map>

View File

@ -6,8 +6,8 @@
#ifndef BITCOIN_ADDRESSINDEX_H
#define BITCOIN_ADDRESSINDEX_H
#include "uint256.h"
#include "amount.h"
#include <uint256.h>
#include <amount.h>
struct CMempoolAddressDelta
{

View File

@ -3,11 +3,11 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "addrman.h"
#include <addrman.h>
#include "hash.h"
#include "serialize.h"
#include "streams.h"
#include <hash.h>
#include <serialize.h>
#include <streams.h>
int CAddrInfo::GetTriedBucket(const uint256& nKey) const
{

View File

@ -6,12 +6,12 @@
#ifndef BITCOIN_ADDRMAN_H
#define BITCOIN_ADDRMAN_H
#include "netaddress.h"
#include "protocol.h"
#include "random.h"
#include "sync.h"
#include "timedata.h"
#include "util.h"
#include <netaddress.h>
#include <protocol.h>
#include <random.h>
#include <sync.h>
#include <timedata.h>
#include <util.h>
#include <map>
#include <set>

View File

@ -3,11 +3,11 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "arith_uint256.h"
#include <arith_uint256.h>
#include "uint256.h"
#include "utilstrencodings.h"
#include "crypto/common.h"
#include <uint256.h>
#include <utilstrencodings.h>
#include <crypto/common.h>
#include <stdio.h>
#include <string.h>

View File

@ -2,10 +2,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "base58.h"
#include <base58.h>
#include "hash.h"
#include "uint256.h"
#include <hash.h>
#include <uint256.h>
#include <assert.h>
#include <stdint.h>

View File

@ -14,12 +14,12 @@
#ifndef BITCOIN_BASE58_H
#define BITCOIN_BASE58_H
#include "chainparams.h"
#include "key.h"
#include "pubkey.h"
#include "script/script.h"
#include "script/standard.h"
#include "support/allocators/zeroafterfree.h"
#include <chainparams.h>
#include <key.h>
#include <pubkey.h>
#include <script/script.h>
#include <script/standard.h>
#include <support/allocators/zeroafterfree.h>
#include <string>
#include <vector>

View File

@ -2,8 +2,8 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "batchedlogger.h"
#include "util.h"
#include <batchedlogger.h>
#include <util.h>
CBatchedLogger::CBatchedLogger(uint64_t _category, const std::string& _header) :
accept(LogAcceptCategory(_category)), header(_header)

View File

@ -5,7 +5,7 @@
#ifndef DASH_BATCHEDLOGGER_H
#define DASH_BATCHEDLOGGER_H
#include "tinyformat.h"
#include <tinyformat.h>
class CBatchedLogger
{

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "validation.h"
#include "utiltime.h"
#include <bench/bench.h>
#include <validation.h>
#include <utiltime.h>
// Sanity test: this should loop ten times, and
// min/max/average should be close to 100ms.

View File

@ -2,10 +2,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include <bench/bench.h>
#include "validation.h"
#include "base58.h"
#include <validation.h>
#include <base58.h>
#include <array>
#include <vector>

View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "perf.h"
#include <bench/bench.h>
#include <bench/perf.h>
#include <assert.h>
#include <iostream>

View File

@ -2,16 +2,16 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include <bench/bench.h>
#include "crypto/sha256.h"
#include "key.h"
#include "stacktraces.h"
#include "validation.h"
#include "util.h"
#include "random.h"
#include <crypto/sha256.h>
#include <key.h>
#include <stacktraces.h>
#include <validation.h>
#include <util.h>
#include <random.h>
#include "bls/bls.h"
#include <bls/bls.h>
void InitBLSTests();
void CleanupBLSTests();

View File

@ -2,10 +2,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "random.h"
#include "bls/bls_worker.h"
#include "utiltime.h"
#include <bench/bench.h>
#include <random.h>
#include <bls/bls_worker.h>
#include <utiltime.h>
#include <iostream>

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "random.h"
#include "bls/bls_worker.h"
#include <bench/bench.h>
#include <random.h>
#include <bls/bls_worker.h>
extern CBLSWorker blsWorker;

View File

@ -2,10 +2,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "coins.h"
#include "policy/policy.h"
#include "wallet/crypter.h"
#include <bench/bench.h>
#include <coins.h>
#include <policy/policy.h>
#include <wallet/crypter.h>
#include <vector>

View File

@ -2,14 +2,14 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include <bench/bench.h>
#include "chainparams.h"
#include "validation.h"
#include "streams.h"
#include "consensus/validation.h"
#include <chainparams.h>
#include <validation.h>
#include <streams.h>
#include <consensus/validation.h>
#include "bench/data/block813851.raw.h"
#include <bench/data/block813851.raw.h>
// These are the two major time-sinks which happen after we have fully received
// a block off the wire, but before we can relay the block on to peers using

View File

@ -2,14 +2,14 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "util.h"
#include "validation.h"
#include "checkqueue.h"
#include "prevector.h"
#include <bench/bench.h>
#include <util.h>
#include <validation.h>
#include <checkqueue.h>
#include <prevector.h>
#include <vector>
#include <boost/thread/thread.hpp>
#include "random.h"
#include <random.h>
// This Benchmark tests the CheckQueue with the lightest

View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "wallet/wallet.h"
#include <bench/bench.h>
#include <wallet/wallet.h>
#include <set>

View File

@ -5,16 +5,16 @@
#include <iostream>
#include "bench.h"
#include "bloom.h"
#include "hash.h"
#include "random.h"
#include "uint256.h"
#include "utiltime.h"
#include "crypto/ripemd160.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
#include "crypto/sha512.h"
#include <bench/bench.h>
#include <bloom.h>
#include <hash.h>
#include <random.h>
#include <uint256.h>
#include <utiltime.h>
#include <crypto/ripemd160.h>
#include <crypto/sha1.h>
#include <crypto/sha256.h>
#include <crypto/sha512.h>
/* Number of bytes to hash per iteration */
static const uint64_t BUFFER_SIZE = 1000*1000;

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include <bench/bench.h>
#include "key.h"
#include <key.h>
static void ECDSASign(benchmark::State& state)
{

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include <bench/bench.h>
#include "support/lockedpool.h"
#include <support/lockedpool.h>
#include <iostream>
#include <vector>

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "policy/policy.h"
#include "txmempool.h"
#include <bench/bench.h>
#include <policy/policy.h>
#include <txmempool.h>
#include <list>
#include <vector>

View File

@ -2,11 +2,11 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include <bench/bench.h>
#include "uint256.h"
#include "random.h"
#include "consensus/merkle.h"
#include <uint256.h>
#include <random.h>
#include <consensus/merkle.h>
static void MerkleRoot(benchmark::State& state)
{

View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "perf.h"
#include <bench/perf.h>
#if defined(__i386__) || defined(__x86_64__)

View File

@ -2,10 +2,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "compat.h"
#include "prevector.h"
#include <compat.h>
#include <prevector.h>
#include "bench/bench.h"
#include <bench/bench.h>
struct nontrivial_t {
int x;

View File

@ -4,8 +4,8 @@
#include <iostream>
#include "bench.h"
#include "bloom.h"
#include <bench/bench.h>
#include <bloom.h>
static void RollingBloom(benchmark::State& state)
{

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "tinyformat.h"
#include "utilstrencodings.h"
#include <bench/bench.h>
#include <tinyformat.h>
#include <utilstrencodings.h>
#include <boost/lexical_cast.hpp>
#include <string>

View File

@ -24,10 +24,10 @@
// Source:
// https://github.com/trezor/trezor-crypto
#include "bip39.h"
#include "bip39_english.h"
#include "crypto/sha256.h"
#include "random.h"
#include <bip39.h>
#include <bip39_english.h>
#include <crypto/sha256.h>
#include <random.h>
#include <openssl/evp.h>

View File

@ -24,7 +24,7 @@
#ifndef DASH_BIP39_H
#define DASH_BIP39_H
#include "support/allocators/secure.h"
#include <support/allocators/secure.h>
class CMnemonic
{

View File

@ -2,16 +2,16 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "blockencodings.h"
#include "consensus/consensus.h"
#include "consensus/validation.h"
#include "chainparams.h"
#include "hash.h"
#include "random.h"
#include "streams.h"
#include "txmempool.h"
#include "validation.h"
#include "util.h"
#include <blockencodings.h>
#include <consensus/consensus.h>
#include <consensus/validation.h>
#include <chainparams.h>
#include <hash.h>
#include <random.h>
#include <streams.h>
#include <txmempool.h>
#include <validation.h>
#include <util.h>
#include <unordered_map>

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_BLOCK_ENCODINGS_H
#define BITCOIN_BLOCK_ENCODINGS_H
#include "primitives/block.h"
#include <primitives/block.h>
#include <memory>

View File

@ -2,18 +2,18 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bloom.h"
#include <bloom.h>
#include "primitives/transaction.h"
#include "evo/specialtx.h"
#include "evo/providertx.h"
#include "evo/cbtx.h"
#include "llmq/quorums_commitment.h"
#include "hash.h"
#include "script/script.h"
#include "script/standard.h"
#include "random.h"
#include "streams.h"
#include <primitives/transaction.h>
#include <evo/specialtx.h>
#include <evo/providertx.h>
#include <evo/cbtx.h>
#include <llmq/quorums_commitment.h>
#include <hash.h>
#include <script/script.h>
#include <script/standard.h>
#include <random.h>
#include <streams.h>
#include <math.h>
#include <stdlib.h>

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_BLOOM_H
#define BITCOIN_BLOOM_H
#include "serialize.h"
#include <serialize.h>
#include <vector>

View File

@ -2,14 +2,14 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bls.h"
#include <bls/bls.h>
#include "hash.h"
#include "random.h"
#include "tinyformat.h"
#include <hash.h>
#include <random.h>
#include <tinyformat.h>
#ifndef BUILD_BITCOIN_INTERNAL
#include "support/allocators/mt_pooled_secure.h"
#include <support/allocators/mt_pooled_secure.h>
#endif
#include <assert.h>

View File

@ -5,10 +5,10 @@
#ifndef DASH_CRYPTO_BLS_H
#define DASH_CRYPTO_BLS_H
#include "hash.h"
#include "serialize.h"
#include "uint256.h"
#include "utilstrencodings.h"
#include <hash.h>
#include <serialize.h>
#include <uint256.h>
#include <utilstrencodings.h>
#undef ERROR // chia BLS uses relic, which defines ERROR, which in turn causes win32/win64 builds to print many warnings
#include <chiabls/bls.hpp>

View File

@ -5,7 +5,7 @@
#ifndef DASH_CRYPTO_BLS_BATCHVERIFIER_H
#define DASH_CRYPTO_BLS_BATCHVERIFIER_H
#include "bls.h"
#include <bls/bls.h>
#include <map>
#include <vector>

View File

@ -2,13 +2,13 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bls_ies.h"
#include <bls/bls_ies.h>
#include "hash.h"
#include "random.h"
#include "streams.h"
#include <hash.h>
#include <random.h>
#include <streams.h>
#include "crypto/aes.h"
#include <crypto/aes.h>
template <typename Out>
static bool EncryptBlob(const void* in, size_t inSize, Out& out, const void* symKey, const void* iv)

View File

@ -5,8 +5,8 @@
#ifndef DASH_CRYPTO_BLS_IES_H
#define DASH_CRYPTO_BLS_IES_H
#include "bls.h"
#include "streams.h"
#include <bls/bls.h>
#include <streams.h>
class CBLSIESEncryptedBlob
{

View File

@ -2,11 +2,11 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bls_worker.h"
#include "hash.h"
#include "serialize.h"
#include <bls/bls_worker.h>
#include <hash.h>
#include <serialize.h>
#include "util.h"
#include <util.h>
template <typename T>
bool VerifyVectorHelper(const std::vector<T>& vec, size_t start, size_t count)

View File

@ -5,9 +5,9 @@
#ifndef DASH_CRYPTO_BLS_WORKER_H
#define DASH_CRYPTO_BLS_WORKER_H
#include "bls.h"
#include <bls/bls.h>
#include "ctpl.h"
#include <ctpl.h>
#include <future>
#include <mutex>

View File

@ -9,7 +9,7 @@
#include <list>
#include <cstddef>
#include "serialize.h"
#include <serialize.h>
/**
* Serializable structure for key/value items

View File

@ -10,9 +10,9 @@
#include <list>
#include <set>
#include "serialize.h"
#include <serialize.h>
#include "cachemap.h"
#include <cachemap.h>
/**
* Map like container that keeps the N most recently added items

View File

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "chain.h"
#include <chain.h>
/**
* CChain implementation

View File

@ -6,11 +6,11 @@
#ifndef BITCOIN_CHAIN_H
#define BITCOIN_CHAIN_H
#include "arith_uint256.h"
#include "primitives/block.h"
#include "pow.h"
#include "tinyformat.h"
#include "uint256.h"
#include <arith_uint256.h>
#include <primitives/block.h>
#include <pow.h>
#include <tinyformat.h>
#include <uint256.h>
#include <vector>

View File

@ -4,18 +4,18 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "chainparams.h"
#include "consensus/merkle.h"
#include <chainparams.h>
#include <consensus/merkle.h>
#include "tinyformat.h"
#include "util.h"
#include "utilstrencodings.h"
#include <tinyformat.h>
#include <util.h>
#include <utilstrencodings.h>
#include "arith_uint256.h"
#include <arith_uint256.h>
#include <assert.h>
#include "chainparamsseeds.h"
#include <chainparamsseeds.h>
static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward)
{

View File

@ -6,10 +6,10 @@
#ifndef BITCOIN_CHAINPARAMS_H
#define BITCOIN_CHAINPARAMS_H
#include "chainparamsbase.h"
#include "consensus/params.h"
#include "primitives/block.h"
#include "protocol.h"
#include <chainparamsbase.h>
#include <consensus/params.h>
#include <primitives/block.h>
#include <protocol.h>
#include <memory>
#include <vector>

View File

@ -3,10 +3,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "chainparamsbase.h"
#include <chainparamsbase.h>
#include "tinyformat.h"
#include "util.h"
#include <tinyformat.h>
#include <util.h>
#include <assert.h>

View File

@ -3,13 +3,13 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "checkpoints.h"
#include <checkpoints.h>
#include "chain.h"
#include "chainparams.h"
#include "reverse_iterator.h"
#include "validation.h"
#include "uint256.h"
#include <chain.h>
#include <chainparams.h>
#include <reverse_iterator.h>
#include <validation.h>
#include <uint256.h>
#include <stdint.h>

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_CHECKPOINTS_H
#define BITCOIN_CHECKPOINTS_H
#include "uint256.h"
#include <uint256.h>
#include <map>

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_CHECKQUEUE_H
#define BITCOIN_CHECKQUEUE_H
#include "sync.h"
#include <sync.h>
#include <algorithm>
#include <vector>

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "clientversion.h"
#include <clientversion.h>
#include "tinyformat.h"
#include <tinyformat.h>
#include <string>
@ -39,7 +39,7 @@ const std::string CLIENT_NAME("Dash Core");
//! First, include build.h if requested
#ifdef HAVE_BUILD_INFO
#include "build.h"
#include <obj/build.h>
#endif
//! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$

View File

@ -6,7 +6,7 @@
#define BITCOIN_CLIENTVERSION_H
#if defined(HAVE_CONFIG_H)
#include "config/dash-config.h"
#include <config/dash-config.h>
#endif //HAVE_CONFIG_H
// Check that required client information is defined

View File

@ -2,11 +2,11 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "coins.h"
#include <coins.h>
#include "consensus/consensus.h"
#include "memusage.h"
#include "random.h"
#include <consensus/consensus.h>
#include <memusage.h>
#include <random.h>
#include <assert.h>

View File

@ -6,13 +6,13 @@
#ifndef BITCOIN_COINS_H
#define BITCOIN_COINS_H
#include "primitives/transaction.h"
#include "compressor.h"
#include "core_memusage.h"
#include "hash.h"
#include "memusage.h"
#include "serialize.h"
#include "uint256.h"
#include <primitives/transaction.h>
#include <compressor.h>
#include <core_memusage.h>
#include <hash.h>
#include <memusage.h>
#include <serialize.h>
#include <uint256.h>
#include <assert.h>
#include <stdint.h>

View File

@ -7,7 +7,7 @@
#define BITCOIN_COMPAT_H
#if defined(HAVE_CONFIG_H)
#include "config/dash-config.h"
#include <config/dash-config.h>
#endif
#include <type_traits>
@ -60,7 +60,7 @@
#ifndef WIN32
typedef unsigned int SOCKET;
#include "errno.h"
#include <errno.h>
#define WSAGetLastError() errno
#define WSAEINVAL EINVAL
#define WSAEALREADY EALREADY

View File

@ -6,7 +6,7 @@
#define BITCOIN_COMPAT_BYTESWAP_H
#if defined(HAVE_CONFIG_H)
#include "config/dash-config.h"
#include <config/dash-config.h>
#endif
#include <stdint.h>

View File

@ -6,10 +6,10 @@
#define BITCOIN_COMPAT_ENDIAN_H
#if defined(HAVE_CONFIG_H)
#include "config/dash-config.h"
#include <config/dash-config.h>
#endif
#include "compat/byteswap.h"
#include <compat/byteswap.h>
#include <stdint.h>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include "config/dash-config.h"
#include <config/dash-config.h>
#endif
#include <cstddef>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include "config/dash-config.h"
#include <config/dash-config.h>
#endif
#include <cstddef>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include "config/dash-config.h"
#include <config/dash-config.h>
#endif
#include <cstring>

View File

@ -3,11 +3,11 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "compressor.h"
#include <compressor.h>
#include "hash.h"
#include "pubkey.h"
#include "script/standard.h"
#include <hash.h>
#include <pubkey.h>
#include <script/standard.h>
bool CScriptCompressor::IsToKeyID(CKeyID &hash) const
{

View File

@ -6,9 +6,9 @@
#ifndef BITCOIN_COMPRESSOR_H
#define BITCOIN_COMPRESSOR_H
#include "primitives/transaction.h"
#include "script/script.h"
#include "serialize.h"
#include <primitives/transaction.h>
#include <script/script.h>
#include <serialize.h>
class CKeyID;
class CPubKey;

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "merkle.h"
#include "hash.h"
#include "utilstrencodings.h"
#include <consensus/merkle.h>
#include <hash.h>
#include <utilstrencodings.h>
/* WARNING! If you're reading this because you're learning about crypto
and/or designing a new system that will use merkle trees, keep in mind

View File

@ -8,9 +8,9 @@
#include <stdint.h>
#include <vector>
#include "primitives/transaction.h"
#include "primitives/block.h"
#include "uint256.h"
#include <primitives/transaction.h>
#include <primitives/block.h>
#include <uint256.h>
uint256 ComputeMerkleRoot(std::vector<uint256> hashes, bool* mutated = nullptr);

View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_CONSENSUS_PARAMS_H
#define BITCOIN_CONSENSUS_PARAMS_H
#include "uint256.h"
#include <uint256.h>
#include <map>
#include <string>

View File

@ -2,17 +2,17 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "tx_verify.h"
#include <consensus/tx_verify.h>
#include "consensus.h"
#include "primitives/transaction.h"
#include "script/interpreter.h"
#include "validation.h"
#include <consensus/consensus.h>
#include <primitives/transaction.h>
#include <script/interpreter.h>
#include <consensus/validation.h>
// TODO remove the following dependencies
#include "chain.h"
#include "coins.h"
#include "utilmoneystr.h"
#include <chain.h>
#include <coins.h>
#include <utilmoneystr.h>
bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
{

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_CONSENSUS_TX_VERIFY_H
#define BITCOIN_CONSENSUS_TX_VERIFY_H
#include "amount.h"
#include <amount.h>
#include <stdint.h>
#include <vector>

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_CORE_IO_H
#define BITCOIN_CORE_IO_H
#include "amount.h"
#include <amount.h>
#include <string>
#include <vector>

View File

@ -5,9 +5,9 @@
#ifndef BITCOIN_CORE_MEMUSAGE_H
#define BITCOIN_CORE_MEMUSAGE_H
#include "primitives/transaction.h"
#include "primitives/block.h"
#include "memusage.h"
#include <primitives/transaction.h>
#include <primitives/block.h>
#include <memusage.h>
static inline size_t RecursiveDynamicUsage(const CScript& script) {
return memusage::DynamicUsage(script);

View File

@ -2,17 +2,17 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "core_io.h"
#include <core_io.h>
#include "primitives/block.h"
#include "primitives/transaction.h"
#include "script/script.h"
#include "serialize.h"
#include "streams.h"
#include <primitives/block.h>
#include <primitives/transaction.h>
#include <script/script.h>
#include <serialize.h>
#include <streams.h>
#include <univalue.h>
#include "util.h"
#include "utilstrencodings.h"
#include "version.h"
#include <util.h>
#include <utilstrencodings.h>
#include <version.h>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/predicate.hpp>

View File

@ -2,25 +2,25 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "core_io.h"
#include <core_io.h>
#include "base58.h"
#include "primitives/transaction.h"
#include "script/script.h"
#include "script/standard.h"
#include "serialize.h"
#include "streams.h"
#include "univalue.h"
#include "util.h"
#include "utilmoneystr.h"
#include "utilstrencodings.h"
#include <base58.h>
#include <primitives/transaction.h>
#include <script/script.h>
#include <script/standard.h>
#include <serialize.h>
#include <streams.h>
#include <univalue.h>
#include <util.h>
#include <utilmoneystr.h>
#include <utilstrencodings.h>
#include "spentindex.h"
#include <spentindex.h>
#include "evo/cbtx.h"
#include "evo/providertx.h"
#include "evo/specialtx.h"
#include "llmq/quorums_commitment.h"
#include <evo/cbtx.h>
#include <evo/providertx.h>
#include <evo/specialtx.h>
#include <llmq/quorums_commitment.h>
UniValue ValueFromAmount(const CAmount& amount)
{

View File

@ -2,14 +2,14 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "aes.h"
#include "crypto/common.h"
#include <crypto/aes.h>
#include <crypto/common.h>
#include <assert.h>
#include <string.h>
extern "C" {
#include "crypto/ctaes/ctaes.c"
#include <crypto/ctaes/ctaes.c>
}
AES128Encrypt::AES128Encrypt(const unsigned char key[16])

View File

@ -8,7 +8,7 @@
#define BITCOIN_CRYPTO_AES_H
extern "C" {
#include "crypto/ctaes/ctaes.h"
#include <crypto/ctaes/ctaes.h>
}
static const int AES_BLOCKSIZE = 16;

View File

@ -5,8 +5,8 @@
// Based on the public domain implementation 'merged' by D. J. Bernstein
// See https://cr.yp.to/chacha.html.
#include "crypto/common.h"
#include "crypto/chacha20.h"
#include <crypto/common.h>
#include <crypto/chacha20.h>
#include <string.h>

View File

@ -6,13 +6,13 @@
#define BITCOIN_CRYPTO_COMMON_H
#if defined(HAVE_CONFIG_H)
#include "config/dash-config.h"
#include <config/dash-config.h>
#endif
#include <stdint.h>
#include <string.h>
#include "compat/endian.h"
#include <compat/endian.h>
uint16_t static inline ReadLE16(const unsigned char* ptr)
{

View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "crypto/hmac_sha256.h"
#include <crypto/hmac_sha256.h>
#include <string.h>

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_CRYPTO_HMAC_SHA256_H
#define BITCOIN_CRYPTO_HMAC_SHA256_H
#include "crypto/sha256.h"
#include <crypto/sha256.h>
#include <stdint.h>
#include <stdlib.h>

View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "crypto/hmac_sha512.h"
#include <crypto/hmac_sha512.h>
#include <string.h>

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_CRYPTO_HMAC_SHA512_H
#define BITCOIN_CRYPTO_HMAC_SHA512_H
#include "crypto/sha512.h"
#include <crypto/sha512.h>
#include <stdint.h>
#include <stdlib.h>

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "crypto/ripemd160.h"
#include <crypto/ripemd160.h>
#include "crypto/common.h"
#include <crypto/common.h>
#include <string.h>

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "crypto/sha1.h"
#include <crypto/sha1.h>
#include "crypto/common.h"
#include <crypto/common.h>
#include <string.h>

View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "crypto/sha256.h"
#include "crypto/common.h"
#include <crypto/sha256.h>
#include <crypto/common.h>
#include <assert.h>
#include <string.h>

View File

@ -3,8 +3,8 @@
#include <stdint.h>
#include <immintrin.h>
#include "crypto/sha256.h"
#include "crypto/common.h"
#include <crypto/sha256.h>
#include <crypto/common.h>
namespace sha256d64_avx2 {
namespace {

View File

@ -3,8 +3,8 @@
#include <stdint.h>
#include <immintrin.h>
#include "crypto/sha256.h"
#include "crypto/common.h"
#include <crypto/sha256.h>
#include <crypto/common.h>
namespace sha256d64_sse41 {
namespace {

View File

@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "crypto/sha512.h"
#include <crypto/sha512.h>
#include "crypto/common.h"
#include <crypto/common.h>
#include <string.h>

View File

@ -42,7 +42,7 @@ extern "C"{
#endif
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
/**
* Output size (in bits) for BLAKE-224.

View File

@ -41,7 +41,7 @@ extern "C"{
#endif
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
/**
* Output size (in bits) for BMW-224.

View File

@ -42,7 +42,7 @@ extern "C"{
#endif
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
/**
* Output size (in bits) for CubeHash-224.

View File

@ -41,7 +41,7 @@ extern "C"{
#endif
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
/**
* Output size (in bits) for ECHO-224.

View File

@ -40,7 +40,7 @@ extern "C"{
#endif
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
/**
* Output size (in bits) for Groestl-224.

View File

@ -41,7 +41,7 @@ extern "C"{
#endif
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
/**
* Output size (in bits) for JH-224.

View File

@ -41,7 +41,7 @@ extern "C"{
#endif
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
/**
* Output size (in bits) for Keccak-224.

View File

@ -41,7 +41,7 @@ extern "C"{
#endif
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
/**
* Output size (in bits) for Luffa-224.

View File

@ -39,7 +39,7 @@
#define SPH_SHAVITE_H__
#include <stddef.h>
#include "sph_types.h"
#include <crypto/sph_types.h>
#ifdef __cplusplus
extern "C"{

Some files were not shown because too many files have changed in this diff Show More