From 4f6c180f420c90419edadc659e12949414e958a9 Mon Sep 17 00:00:00 2001 From: fkolakovic Date: Sat, 4 May 2024 12:11:27 +0200 Subject: [PATCH] Rename bitcoin occurrences to vincoin in filenames #2 --- Makefile.am | 60 +++--- build-aux/m4/vincoin_find_bdb48.m4 | 6 +- build-aux/m4/vincoin_qt.m4 | 102 ++++----- build-aux/m4/vincoin_subdir_to_include.m4 | 4 +- build_msvc/msvc-autogen.py | 8 +- build_msvc/vincoin_config.h.in | 6 +- build_msvc/vincoind/vincoind.vcxproj | 8 +- ci/test/00_setup_env_android.sh | 2 +- ci/test/00_setup_env_arm.sh | 2 +- ci/test/00_setup_env_i686_centos.sh | 2 +- ci/test/00_setup_env_i686_multiprocess.sh | 4 +- ci/test/00_setup_env_mac_cross.sh | 2 +- ci/test/00_setup_env_mac_native.sh | 2 +- ci/test/00_setup_env_native_asan.sh | 2 +- ci/test/00_setup_env_native_fuzz.sh | 2 +- ci/test/00_setup_env_native_fuzz_with_msan.sh | 2 +- .../00_setup_env_native_fuzz_with_valgrind.sh | 2 +- ci/test/00_setup_env_native_msan.sh | 2 +- ...up_env_native_nowallet_libvincoinkernel.sh | 2 +- .../00_setup_env_native_previous_releases.sh | 2 +- ci/test/00_setup_env_native_tidy.sh | 2 +- ci/test/00_setup_env_native_tsan.sh | 2 +- ci/test/00_setup_env_native_valgrind.sh | 2 +- ci/test/00_setup_env_s390x.sh | 2 +- ci/test/00_setup_env_win64.sh | 2 +- ci/test/03_test_script.sh | 14 +- configure.ac | 76 +++---- contrib/devtools/gen-vincoin-conf.sh | 14 +- .../devtools/test_deterministic_coverage.sh | 8 +- contrib/devtools/utxo_snapshot.sh | 18 +- contrib/guix/libexec/build.sh | 2 +- contrib/init/vincoind.conf | 40 ++-- contrib/init/vincoind.init | 12 +- contrib/init/vincoind.openrc | 58 ++--- contrib/init/vincoind.openrcconf | 22 +- contrib/seeds/generate-seeds.py | 6 +- contrib/seeds/nodes_main.txt | 18 +- contrib/seeds/nodes_main_manual.txt | 18 +- contrib/verify-commits/README.md | 2 +- contrib/verify-commits/gpg.sh | 2 +- contrib/verify-commits/verify-commits.py | 2 +- doc/developer-notes.md | 8 +- doc/init.md | 4 +- doc/man/Makefile.am | 10 +- doc/man/vincoin-cli.1 | 2 +- doc/man/vincoin-qt.1 | 2 +- doc/man/vincoin-tx.1 | 2 +- doc/man/vincoin-util.1 | 2 +- doc/man/vincoin-wallet.1 | 2 +- doc/man/vincoind.1 | 2 +- doc/multiprocess.md | 4 +- doc/psbt.md | 2 +- doc/tor.md | 2 +- share/genbuild.sh | 2 +- share/setup.nsi.in | 24 +-- src/Makefile.am | 202 +++++++++--------- src/Makefile.bench.include | 22 +- src/Makefile.qt.include | 48 ++--- src/Makefile.qttest.include | 16 +- src/Makefile.test.include | 62 +++--- src/Makefile.test_fuzz.include | 2 +- src/Makefile.test_util.include | 2 +- src/addrdb.h | 6 +- src/addresstype.h | 6 +- src/addrman.h | 6 +- src/addrman_impl.h | 6 +- src/arith_uint256.h | 6 +- src/attributes.h | 6 +- src/banman.h | 6 +- src/base58.h | 6 +- src/bech32.h | 6 +- src/bench/bench.h | 6 +- src/bench/data.h | 6 +- src/bench/data/block413567.raw | Bin 999887 -> 999887 bytes src/bench/wallet_create_tx.cpp | 2 +- src/bip324.h | 6 +- src/blockencodings.h | 6 +- src/blockfilter.h | 6 +- src/chain.h | 6 +- src/chainparams.h | 6 +- src/chainparamsbase.h | 6 +- src/chainparamsseeds.h | 6 +- src/checkqueue.h | 6 +- src/clientversion.h | 6 +- src/coins.h | 6 +- src/common/args.cpp | 6 +- src/common/args.h | 10 +- src/common/bloom.h | 6 +- src/common/config.cpp | 2 +- src/common/init.cpp | 6 +- src/common/init.h | 6 +- src/common/run_command.h | 6 +- src/common/settings.h | 6 +- src/common/system.h | 6 +- src/common/url.h | 6 +- src/compat/assumptions.h | 6 +- src/compat/byteswap.h | 6 +- src/compat/compat.h | 6 +- src/compat/cpuid.h | 6 +- src/compat/endian.h | 6 +- src/compat/stdin.h | 6 +- src/compressor.h | 6 +- src/consensus/amount.h | 10 +- src/consensus/consensus.h | 6 +- src/consensus/merkle.h | 6 +- src/consensus/params.h | 6 +- src/consensus/tx_check.h | 6 +- src/consensus/tx_verify.h | 6 +- src/consensus/validation.h | 6 +- src/core_io.h | 6 +- src/core_memusage.h | 6 +- src/crypto/aes.h | 6 +- src/crypto/chacha20.h | 6 +- src/crypto/chacha20poly1305.h | 6 +- src/crypto/common.h | 6 +- src/crypto/hkdf_sha256_32.h | 6 +- src/crypto/hmac_sha256.h | 6 +- src/crypto/hmac_sha512.h | 6 +- src/crypto/muhash.h | 6 +- src/crypto/poly1305.h | 6 +- src/crypto/ripemd160.h | 6 +- src/crypto/sha1.h | 6 +- src/crypto/sha256.h | 6 +- src/crypto/sha3.h | 6 +- src/crypto/sha512.h | 6 +- src/crypto/siphash.h | 6 +- src/cuckoocache.h | 6 +- src/dbwrapper.h | 6 +- src/deploymentinfo.h | 6 +- src/deploymentstatus.h | 6 +- src/external_signer.h | 6 +- src/flatfile.h | 6 +- src/hash.h | 6 +- src/headerssync.h | 6 +- src/httprpc.h | 6 +- src/httpserver.h | 6 +- src/i2p.h | 6 +- src/index/base.h | 6 +- src/index/blockfilterindex.h | 6 +- src/index/coinstatsindex.h | 6 +- src/index/disktxpos.h | 6 +- src/index/txindex.h | 6 +- src/indirectmap.h | 6 +- src/init.cpp | 12 +- src/init.h | 6 +- src/init/common.h | 6 +- src/interfaces/chain.h | 6 +- src/interfaces/echo.h | 6 +- src/interfaces/handler.h | 6 +- src/interfaces/init.h | 6 +- src/interfaces/ipc.h | 6 +- src/interfaces/node.h | 6 +- src/interfaces/wallet.h | 6 +- src/ipc/capnp/common-types.h | 6 +- src/ipc/capnp/context.h | 6 +- src/ipc/capnp/init-types.h | 6 +- src/ipc/capnp/protocol.h | 6 +- src/ipc/context.h | 6 +- src/ipc/exception.h | 6 +- src/ipc/process.h | 6 +- src/ipc/protocol.h | 6 +- src/kernel/blockmanager_opts.h | 6 +- src/kernel/chain.h | 6 +- src/kernel/chainparams.cpp | 4 +- src/kernel/chainparams.h | 6 +- src/kernel/chainstatemanager_opts.h | 6 +- src/kernel/checks.h | 6 +- src/kernel/coinstats.h | 6 +- src/kernel/context.h | 6 +- src/kernel/cs_main.h | 6 +- src/kernel/disconnected_transactions.h | 6 +- src/kernel/mempool_entry.h | 6 +- src/kernel/mempool_limits.h | 6 +- src/kernel/mempool_options.h | 6 +- src/kernel/mempool_persist.h | 6 +- src/kernel/mempool_removal_reason.h | 6 +- src/kernel/messagestartchars.h | 6 +- src/kernel/notifications_interface.h | 6 +- src/kernel/validation_cache_sizes.h | 6 +- src/key.h | 6 +- src/key_io.h | 6 +- src/logging.h | 6 +- src/logging/timer.h | 6 +- src/mapport.h | 6 +- src/memusage.h | 6 +- src/merkleblock.h | 6 +- src/net.h | 6 +- src/net_permissions.h | 6 +- src/net_processing.h | 6 +- src/net_types.h | 6 +- src/netaddress.h | 6 +- src/netbase.h | 6 +- src/netgroup.h | 6 +- src/netmessagemaker.h | 6 +- src/node/abort.h | 6 +- src/node/blockmanager_args.h | 6 +- src/node/blockstorage.h | 6 +- src/node/caches.h | 6 +- src/node/chainstate.h | 6 +- src/node/chainstatemanager_args.h | 6 +- src/node/coin.h | 6 +- src/node/coins_view_args.h | 6 +- src/node/connection_types.h | 6 +- src/node/context.h | 6 +- src/node/database_args.h | 6 +- src/node/eviction.h | 6 +- src/node/interface_ui.h | 6 +- src/node/kernel_notifications.h | 6 +- src/node/mempool_args.h | 6 +- src/node/mempool_persist_args.h | 6 +- src/node/miner.h | 6 +- src/node/mini_miner.h | 6 +- src/node/minisketchwrapper.h | 6 +- src/node/peerman_args.h | 6 +- src/node/protocol_version.h | 6 +- src/node/psbt.h | 6 +- src/node/transaction.h | 6 +- src/node/txreconciliation.h | 6 +- src/node/utxo_snapshot.h | 6 +- src/node/validation_cache_args.h | 6 +- src/noui.h | 6 +- src/outputtype.h | 6 +- src/policy/feerate.h | 12 +- src/policy/fees.cpp | 4 +- src/policy/fees.h | 6 +- src/policy/fees_args.h | 6 +- src/policy/packages.h | 6 +- src/policy/policy.h | 6 +- src/policy/rbf.h | 6 +- src/policy/settings.h | 6 +- src/policy/v3_policy.h | 6 +- src/pow.h | 6 +- src/prevector.h | 6 +- src/primitives/block.h | 6 +- src/primitives/transaction.h | 6 +- src/protocol.h | 6 +- src/psbt.h | 6 +- src/pubkey.h | 6 +- src/qt/README.md | 2 +- src/qt/addressbookpage.h | 6 +- src/qt/addresstablemodel.h | 6 +- src/qt/askpassphrasedialog.cpp | 2 +- src/qt/askpassphrasedialog.h | 6 +- src/qt/bantablemodel.h | 6 +- src/qt/clientmodel.h | 6 +- src/qt/coincontroldialog.cpp | 2 +- src/qt/coincontroldialog.h | 6 +- src/qt/coincontroltreewidget.h | 6 +- src/qt/createwalletdialog.h | 6 +- src/qt/csvmodelwriter.h | 6 +- src/qt/editaddressdialog.h | 6 +- src/qt/forms/coincontroldialog.ui | 8 +- src/qt/forms/optionsdialog.ui | 4 +- src/qt/forms/overviewpage.ui | 16 +- src/qt/forms/receiverequestdialog.ui | 2 +- src/qt/forms/sendcoinsdialog.ui | 10 +- src/qt/guiconstants.h | 6 +- src/qt/guiutil.cpp | 4 +- src/qt/guiutil.h | 6 +- src/qt/initexecutor.h | 6 +- src/qt/intro.h | 6 +- src/qt/locale/vincoin_am.ts | 2 +- src/qt/locale/vincoin_az.ts | 2 +- src/qt/locale/vincoin_az@latin.ts | 2 +- src/qt/locale/vincoin_be.ts | 2 +- src/qt/locale/vincoin_bg.ts | 2 +- src/qt/locale/vincoin_bs.ts | 2 +- src/qt/locale/vincoin_ca.ts | 4 +- src/qt/locale/vincoin_cmn.ts | 2 +- src/qt/locale/vincoin_cs.ts | 4 +- src/qt/locale/vincoin_cy.ts | 4 +- src/qt/locale/vincoin_da.ts | 4 +- src/qt/locale/vincoin_de.ts | 4 +- src/qt/locale/vincoin_de_AT.ts | 4 +- src/qt/locale/vincoin_de_CH.ts | 4 +- src/qt/locale/vincoin_el.ts | 4 +- src/qt/locale/vincoin_en.ts | 2 +- src/qt/locale/vincoin_en.xlf | 2 +- src/qt/locale/vincoin_eo.ts | 2 +- src/qt/locale/vincoin_es.ts | 4 +- src/qt/locale/vincoin_es_CL.ts | 4 +- src/qt/locale/vincoin_es_CO.ts | 4 +- src/qt/locale/vincoin_es_DO.ts | 4 +- src/qt/locale/vincoin_es_SV.ts | 4 +- src/qt/locale/vincoin_es_VE.ts | 4 +- src/qt/locale/vincoin_et.ts | 4 +- src/qt/locale/vincoin_eu.ts | 4 +- src/qt/locale/vincoin_fi.ts | 4 +- src/qt/locale/vincoin_fil.ts | 4 +- src/qt/locale/vincoin_fr.ts | 4 +- src/qt/locale/vincoin_fr_CM.ts | 4 +- src/qt/locale/vincoin_fr_LU.ts | 4 +- src/qt/locale/vincoin_ga.ts | 4 +- src/qt/locale/vincoin_ga_IE.ts | 4 +- src/qt/locale/vincoin_gl.ts | 4 +- src/qt/locale/vincoin_gl_ES.ts | 4 +- src/qt/locale/vincoin_gu.ts | 2 +- src/qt/locale/vincoin_ha.ts | 4 +- src/qt/locale/vincoin_hak.ts | 2 +- src/qt/locale/vincoin_he.ts | 2 +- src/qt/locale/vincoin_hi.ts | 2 +- src/qt/locale/vincoin_hr.ts | 4 +- src/qt/locale/vincoin_hu.ts | 4 +- src/qt/locale/vincoin_id.ts | 4 +- src/qt/locale/vincoin_is.ts | 4 +- src/qt/locale/vincoin_it.ts | 4 +- src/qt/locale/vincoin_ja.ts | 2 +- src/qt/locale/vincoin_ka.ts | 2 +- src/qt/locale/vincoin_kk.ts | 4 +- src/qt/locale/vincoin_kk@latin.ts | 4 +- src/qt/locale/vincoin_km.ts | 4 +- src/qt/locale/vincoin_ko.ts | 2 +- src/qt/locale/vincoin_la.ts | 2 +- src/qt/locale/vincoin_lb.ts | 4 +- src/qt/locale/vincoin_lt.ts | 4 +- src/qt/locale/vincoin_lv.ts | 2 +- src/qt/locale/vincoin_mi.ts | 4 +- src/qt/locale/vincoin_mk.ts | 2 +- src/qt/locale/vincoin_ml.ts | 2 +- src/qt/locale/vincoin_ms.ts | 4 +- src/qt/locale/vincoin_mt.ts | 4 +- src/qt/locale/vincoin_nb.ts | 4 +- src/qt/locale/vincoin_nl.ts | 4 +- src/qt/locale/vincoin_pam.ts | 4 +- src/qt/locale/vincoin_pl.ts | 2 +- src/qt/locale/vincoin_pt.ts | 4 +- src/qt/locale/vincoin_pt_BR.ts | 4 +- src/qt/locale/vincoin_ro.ts | 4 +- src/qt/locale/vincoin_ru.ts | 2 +- src/qt/locale/vincoin_ru_RU.ts | 2 +- src/qt/locale/vincoin_si.ts | 2 +- src/qt/locale/vincoin_sk.ts | 4 +- src/qt/locale/vincoin_sl.ts | 4 +- src/qt/locale/vincoin_so.ts | 4 +- src/qt/locale/vincoin_sr.ts | 2 +- src/qt/locale/vincoin_sr@ijekavianlatin.ts | 2 +- src/qt/locale/vincoin_sr@latin.ts | 2 +- src/qt/locale/vincoin_sv.ts | 4 +- src/qt/locale/vincoin_sw.ts | 4 +- src/qt/locale/vincoin_szl.ts | 4 +- src/qt/locale/vincoin_ta.ts | 2 +- src/qt/locale/vincoin_te.ts | 2 +- src/qt/locale/vincoin_tk.ts | 2 +- src/qt/locale/vincoin_tl.ts | 4 +- src/qt/locale/vincoin_tr.ts | 4 +- src/qt/locale/vincoin_ug.ts | 2 +- src/qt/locale/vincoin_uk.ts | 2 +- src/qt/locale/vincoin_ur.ts | 2 +- src/qt/locale/vincoin_uz.ts | 4 +- src/qt/locale/vincoin_uz@Cyrl.ts | 4 +- src/qt/locale/vincoin_uz@Latn.ts | 4 +- src/qt/locale/vincoin_vi.ts | 4 +- src/qt/locale/vincoin_yue.ts | 2 +- src/qt/locale/vincoin_zh-Hans.ts | 2 +- src/qt/locale/vincoin_zh-Hant.ts | 2 +- src/qt/locale/vincoin_zh.ts | 2 +- src/qt/locale/vincoin_zh_CN.ts | 2 +- src/qt/locale/vincoin_zh_HK.ts | 2 +- src/qt/locale/vincoin_zh_TW.ts | 2 +- src/qt/macdockiconhandler.h | 6 +- src/qt/macnotificationhandler.h | 6 +- src/qt/macos_appnap.h | 6 +- src/qt/modaloverlay.h | 6 +- src/qt/networkstyle.h | 6 +- src/qt/notificator.h | 6 +- src/qt/openuridialog.h | 6 +- src/qt/optionsdialog.cpp | 2 +- src/qt/optionsdialog.h | 6 +- src/qt/optionsmodel.cpp | 8 +- src/qt/optionsmodel.h | 10 +- src/qt/overviewpage.cpp | 4 +- src/qt/overviewpage.h | 6 +- src/qt/paymentserver.cpp | 12 +- src/qt/paymentserver.h | 8 +- src/qt/peertablemodel.h | 6 +- src/qt/peertablesortproxy.h | 6 +- src/qt/platformstyle.h | 6 +- src/qt/psbtoperationsdialog.cpp | 4 +- src/qt/psbtoperationsdialog.h | 6 +- src/qt/qrimagewidget.h | 6 +- src/qt/qvalidatedlineedit.h | 6 +- src/qt/qvaluecombobox.h | 6 +- src/qt/receivecoinsdialog.h | 6 +- src/qt/receiverequestdialog.h | 6 +- src/qt/recentrequeststablemodel.h | 6 +- src/qt/res/icons/vincoin.icns | Bin 919273 -> 919273 bytes src/qt/rpcconsole.h | 6 +- src/qt/sendcoinsdialog.cpp | 4 +- src/qt/sendcoinsdialog.h | 6 +- src/qt/sendcoinsentry.cpp | 2 +- src/qt/sendcoinsentry.h | 6 +- src/qt/sendcoinsrecipient.h | 6 +- src/qt/signverifymessagedialog.h | 6 +- src/qt/splashscreen.h | 6 +- src/qt/test/addressbooktests.h | 6 +- src/qt/test/apptests.h | 6 +- src/qt/test/optiontests.h | 6 +- src/qt/test/rpcnestedtests.h | 6 +- src/qt/test/uritests.h | 6 +- src/qt/test/util.h | 6 +- src/qt/test/wallettests.h | 6 +- src/qt/trafficgraphwidget.h | 6 +- src/qt/transactiondesc.h | 6 +- src/qt/transactiondescdialog.h | 6 +- src/qt/transactionfilterproxy.h | 6 +- src/qt/transactionoverviewwidget.h | 6 +- src/qt/transactionrecord.h | 6 +- src/qt/transactiontablemodel.h | 6 +- src/qt/transactionview.h | 6 +- src/qt/utilitydialog.h | 6 +- src/qt/vincoin.cpp | 2 +- src/qt/vincoin.h | 6 +- src/qt/vincoinaddressvalidator.h | 6 +- src/qt/vincoinamountfield.cpp | 4 +- src/qt/vincoinamountfield.h | 6 +- src/qt/vincoingui.h | 6 +- src/qt/vincoinunits.cpp | 52 ++--- src/qt/vincoinunits.h | 12 +- src/qt/walletcontroller.h | 6 +- src/qt/walletframe.h | 6 +- src/qt/walletmodel.cpp | 2 +- src/qt/walletmodel.h | 6 +- src/qt/walletmodeltransaction.h | 6 +- src/qt/walletview.h | 6 +- src/qt/winshutdownmonitor.h | 6 +- src/random.h | 6 +- src/randomenv.h | 6 +- src/rest.h | 6 +- src/reverse_iterator.h | 6 +- src/rpc/blockchain.h | 6 +- src/rpc/client.h | 6 +- src/rpc/mempool.cpp | 4 +- src/rpc/mempool.h | 6 +- src/rpc/mining.cpp | 2 +- src/rpc/mining.h | 6 +- src/rpc/protocol.h | 6 +- src/rpc/rawtransaction_util.h | 6 +- src/rpc/register.h | 6 +- src/rpc/request.h | 6 +- src/rpc/server.h | 6 +- src/rpc/server_util.h | 6 +- src/rpc/util.cpp | 2 +- src/rpc/util.h | 10 +- src/scheduler.h | 6 +- src/script/descriptor.h | 6 +- src/script/interpreter.h | 6 +- src/script/keyorigin.h | 6 +- src/script/miniscript.h | 6 +- src/script/script.h | 6 +- src/script/script_error.h | 6 +- src/script/sigcache.h | 6 +- src/script/sign.h | 6 +- src/script/signingprovider.h | 6 +- src/script/solver.h | 6 +- src/script/vincoinconsensus.cpp | 2 +- src/script/vincoinconsensus.h | 12 +- .../ecdsa_secp256k1_sha256_vincoin_test.json | 2 +- src/serialize.h | 6 +- src/signet.h | 6 +- src/span.h | 6 +- src/streams.h | 6 +- src/support/allocators/pool.h | 6 +- src/support/allocators/secure.h | 6 +- src/support/allocators/zeroafterfree.h | 6 +- src/support/cleanse.h | 6 +- src/support/events.h | 6 +- src/support/lockedpool.h | 6 +- src/sync.h | 6 +- src/test/amount_tests.cpp | 6 +- src/test/compress_tests.cpp | 8 +- src/test/fuzz/fuzz.h | 6 +- src/test/fuzz/script_vincoin_consensus.cpp | 2 +- src/test/fuzz/util.h | 6 +- src/test/fuzz/util/descriptor.h | 6 +- src/test/fuzz/util/mempool.h | 6 +- src/test/fuzz/util/net.h | 6 +- src/test/ipc_test.h | 6 +- src/test/miner_tests.cpp | 2 +- src/test/scriptnum10.h | 6 +- src/test/txpackage_tests.cpp | 4 +- src/test/util/blockfilter.h | 6 +- src/test/util/chainstate.h | 6 +- src/test/util/coins.h | 6 +- src/test/util/index.h | 6 +- src/test/util/json.h | 6 +- src/test/util/logging.h | 6 +- src/test/util/mining.h | 6 +- src/test/util/net.h | 6 +- src/test/util/poolresourcetester.h | 6 +- src/test/util/random.h | 6 +- src/test/util/script.h | 6 +- src/test/util/setup_common.h | 6 +- src/test/util/str.h | 6 +- src/test/util/transaction_utils.h | 6 +- src/test/util/txmempool.h | 6 +- src/test/util/validation.h | 6 +- src/test/util/xoroshiro128plusplus.h | 6 +- src/threadsafety.h | 6 +- src/timedata.cpp | 8 +- src/timedata.h | 6 +- src/torcontrol.h | 6 +- src/txdb.h | 6 +- src/txmempool.h | 6 +- src/txorphanage.h | 6 +- src/txrequest.h | 6 +- src/uint256.h | 6 +- src/undo.h | 6 +- src/univalue/include/univalue.h | 6 +- src/univalue/include/univalue_escapes.h | 6 +- src/univalue/include/univalue_utffilter.h | 6 +- src/univalue/test/object.cpp | 2 +- src/util/any.h | 6 +- src/util/asmap.h | 6 +- src/util/batchpriority.h | 6 +- src/util/bip32.h | 6 +- src/util/bitdeque.h | 6 +- src/util/bytevectorhash.h | 6 +- src/util/chaintype.h | 6 +- src/util/check.h | 6 +- src/util/epochguard.h | 6 +- src/util/error.h | 6 +- src/util/exception.h | 6 +- src/util/fastrange.h | 6 +- src/util/fees.h | 6 +- src/util/fs.h | 6 +- src/util/fs_helpers.h | 6 +- src/util/golombrice.h | 6 +- src/util/hash_type.h | 6 +- src/util/hasher.h | 6 +- src/util/insert.h | 6 +- src/util/macros.h | 6 +- src/util/message.h | 6 +- src/util/moneystr.h | 6 +- src/util/overflow.h | 6 +- src/util/overloaded.h | 6 +- src/util/rbf.h | 6 +- src/util/readwritefile.h | 6 +- src/util/result.h | 6 +- src/util/serfloat.h | 6 +- src/util/signalinterrupt.h | 6 +- src/util/sock.h | 6 +- src/util/spanparsing.h | 6 +- src/util/strencodings.h | 6 +- src/util/string.h | 6 +- src/util/syserror.h | 6 +- src/util/thread.h | 6 +- src/util/threadinterrupt.h | 6 +- src/util/threadnames.h | 6 +- src/util/time.h | 6 +- src/util/tokenpipe.h | 6 +- src/util/trace.h | 6 +- src/util/transaction_identifier.h | 6 +- src/util/translation.h | 6 +- src/util/types.h | 6 +- src/util/ui_change_type.h | 6 +- src/util/vector.h | 6 +- src/validation.h | 6 +- src/validationinterface.h | 6 +- src/versionbits.h | 6 +- src/vincoin-cli.cpp | 2 +- src/wallet/bdb.h | 6 +- src/wallet/coincontrol.h | 6 +- src/wallet/coinselection.h | 6 +- src/wallet/context.h | 6 +- src/wallet/crypter.h | 6 +- src/wallet/db.h | 6 +- src/wallet/dump.cpp | 2 +- src/wallet/dump.h | 6 +- src/wallet/external_signer_scriptpubkeyman.h | 6 +- src/wallet/feebumper.h | 6 +- src/wallet/fees.h | 6 +- src/wallet/load.h | 6 +- src/wallet/receive.h | 6 +- src/wallet/rpc/spend.cpp | 18 +- src/wallet/rpc/util.h | 6 +- src/wallet/rpc/wallet.h | 6 +- src/wallet/salvage.h | 6 +- src/wallet/scriptpubkeyman.h | 6 +- src/wallet/spend.h | 6 +- src/wallet/sqlite.h | 6 +- src/wallet/test/coinselector_tests.cpp | 34 +-- src/wallet/test/fuzz/coinselection.cpp | 2 +- src/wallet/test/init_test_fixture.h | 6 +- src/wallet/test/spend_tests.cpp | 16 +- src/wallet/test/util.h | 6 +- src/wallet/test/wallet_test_fixture.h | 6 +- src/wallet/transaction.h | 6 +- src/wallet/types.h | 6 +- src/wallet/wallet.h | 6 +- src/wallet/walletdb.h | 6 +- src/wallet/wallettool.h | 6 +- src/wallet/walletutil.h | 6 +- src/walletinitinterface.h | 6 +- src/warnings.h | 6 +- src/zmq/zmqabstractnotifier.h | 6 +- src/zmq/zmqnotificationinterface.h | 6 +- src/zmq/zmqpublishnotifier.h | 6 +- src/zmq/zmqrpc.h | 6 +- src/zmq/zmqutil.h | 6 +- test/config.ini.in | 8 +- test/functional/README.md | 2 +- test/functional/feature_coinstatsindex.py | 2 +- test/functional/feature_rbf.py | 6 +- test/functional/interface_vincoin_cli.py | 10 +- test/functional/mempool_accept.py | 6 +- test/functional/mempool_dust.py | 6 +- test/functional/mempool_limit.py | 8 +- test/functional/mining_basic.py | 18 +- test/functional/rpc_psbt.py | 6 +- test/functional/rpc_rawtransaction.py | 6 +- test/functional/rpc_scantxoutset.py | 2 +- test/functional/test_framework/messages.py | 2 +- .../test_framework/test_framework.py | 10 +- test/functional/test_framework/test_node.py | 4 +- test/functional/test_framework/util.py | 20 +- test/functional/test_runner.py | 2 +- test/functional/tool_wallet.py | 12 +- test/functional/wallet_abandonconflict.py | 10 +- .../wallet_avoid_mixing_output_types.py | 14 +- test/functional/wallet_avoidreuse.py | 64 +++--- test/functional/wallet_balance.py | 4 +- test/functional/wallet_basic.py | 34 +-- test/functional/wallet_bumpfee.py | 14 +- test/functional/wallet_fundrawtransaction.py | 48 ++--- test/functional/wallet_groups.py | 2 +- test/functional/wallet_import_rescan.py | 4 +- test/functional/wallet_listsinceblock.py | 4 +- test/functional/wallet_send.py | 2 +- test/functional/wallet_simulaterawtx.py | 2 +- test/functional/wallet_spend_unconfirmed.py | 4 +- .../wallet_transactiontime_rescan.py | 16 +- test/functional/wallet_txn_clone.py | 6 +- test/functional/wallet_txn_doublespend.py | 10 +- test/functional/wallet_watchonly.py | 4 +- test/lint/lint-include-guards.py | 4 +- test/util/test_runner.py | 4 +- 636 files changed, 2172 insertions(+), 2172 deletions(-) diff --git a/Makefile.am b/Makefile.am index 49e91891a34c6..fbf3b5795f981 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,21 +14,21 @@ endif .PHONY: deploy FORCE .INTERMEDIATE: $(COVERAGE_INFO) -if BUILD_BITCOIN_LIBS +if BUILD_VINCOIN_LIBS pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libvincoinconsensus.pc endif -BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT) -BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT) -BITCOIN_TEST_BIN=$(top_builddir)/src/test/$(BITCOIN_TEST_NAME)$(EXEEXT) -BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT) -BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT) -BITCOIN_UTIL_BIN=$(top_builddir)/src/$(BITCOIN_UTIL_NAME)$(EXEEXT) -BITCOIN_WALLET_BIN=$(top_builddir)/src/$(BITCOIN_WALLET_TOOL_NAME)$(EXEEXT) -BITCOIN_NODE_BIN=$(top_builddir)/src/$(BITCOIN_MP_NODE_NAME)$(EXEEXT) -BITCOIN_GUI_BIN=$(top_builddir)/src/$(BITCOIN_MP_GUI_NAME)$(EXEEXT) -BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win64-setup$(EXEEXT) +VINCOIND_BIN=$(top_builddir)/src/$(VINCOIN_DAEMON_NAME)$(EXEEXT) +VINCOIN_QT_BIN=$(top_builddir)/src/qt/$(VINCOIN_GUI_NAME)$(EXEEXT) +VINCOIN_TEST_BIN=$(top_builddir)/src/test/$(VINCOIN_TEST_NAME)$(EXEEXT) +VINCOIN_CLI_BIN=$(top_builddir)/src/$(VINCOIN_CLI_NAME)$(EXEEXT) +VINCOIN_TX_BIN=$(top_builddir)/src/$(VINCOIN_TX_NAME)$(EXEEXT) +VINCOIN_UTIL_BIN=$(top_builddir)/src/$(VINCOIN_UTIL_NAME)$(EXEEXT) +VINCOIN_WALLET_BIN=$(top_builddir)/src/$(VINCOIN_WALLET_TOOL_NAME)$(EXEEXT) +VINCOIN_NODE_BIN=$(top_builddir)/src/$(VINCOIN_MP_NODE_NAME)$(EXEEXT) +VINCOIN_GUI_BIN=$(top_builddir)/src/$(VINCOIN_MP_GUI_NAME)$(EXEEXT) +VINCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win64-setup$(EXEEXT) empty := space := $(empty) $(empty) @@ -73,20 +73,20 @@ dist-hook: -$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf - if TARGET_WINDOWS -$(BITCOIN_WIN_INSTALLER): all-recursive +$(VINCOIN_WIN_INSTALLER): all-recursive $(MKDIR_P) $(top_builddir)/release - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TEST_BIN) $(top_builddir)/release - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_WALLET_BIN) $(top_builddir)/release - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_UTIL_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(VINCOIND_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(VINCOIN_QT_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(VINCOIN_TEST_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(VINCOIN_CLI_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(VINCOIN_TX_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(VINCOIN_WALLET_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(VINCOIN_UTIL_BIN) $(top_builddir)/release @test -f $(MAKENSIS) && echo 'OutFile "$@"' | cat $(top_builddir)/share/setup.nsi - | $(MAKENSIS) -V2 - || \ echo error: could not build $@ @echo built $@ -deploy: $(BITCOIN_WIN_INSTALLER) +deploy: $(VINCOIN_WIN_INSTALLER) endif if TARGET_DARWIN @@ -108,7 +108,7 @@ $(OSX_APP)/Contents/Resources/vincoin.icns: $(OSX_INSTALLER_ICONS) $(OSX_APP)/Contents/MacOS/Vincoin-Qt: all-recursive $(MKDIR_P) $(@D) - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@ + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(VINCOIN_QT_BIN) $@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(MKDIR_P) $(@D) @@ -142,28 +142,28 @@ endif !BUILD_DARWIN deploy: $(OSX_ZIP) endif -$(BITCOIN_QT_BIN): FORCE +$(VINCOIN_QT_BIN): FORCE $(MAKE) -C src qt/$(@F) -$(BITCOIND_BIN): FORCE +$(VINCOIND_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_CLI_BIN): FORCE +$(VINCOIN_CLI_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_TX_BIN): FORCE +$(VINCOIN_TX_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_UTIL_BIN): FORCE +$(VINCOIN_UTIL_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_WALLET_BIN): FORCE +$(VINCOIN_WALLET_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_NODE_BIN): FORCE +$(VINCOIN_NODE_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_GUI_BIN): FORCE +$(VINCOIN_GUI_BIN): FORCE $(MAKE) -C src $(@F) if USE_LCOV @@ -316,7 +316,7 @@ EXTRA_DIST += \ test/util/data/txreplacesingleinput.hex \ test/util/rpcauth-test.py -CLEANFILES = $(OSX_ZIP) $(BITCOIN_WIN_INSTALLER) +CLEANFILES = $(OSX_ZIP) $(VINCOIN_WIN_INSTALLER) DISTCHECK_CONFIGURE_FLAGS = --enable-man diff --git a/build-aux/m4/vincoin_find_bdb48.m4 b/build-aux/m4/vincoin_find_bdb48.m4 index 59fc986e33c9f..c7a82be7f9f48 100644 --- a/build-aux/m4/vincoin_find_bdb48.m4 +++ b/build-aux/m4/vincoin_find_bdb48.m4 @@ -2,7 +2,7 @@ dnl Copyright (c) 2013-2015 The Vincoin Core developers dnl Distributed under the MIT software license, see the accompanying dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. -AC_DEFUN([BITCOIN_FIND_BDB48],[ +AC_DEFUN([VINCOIN_FIND_BDB48],[ AC_ARG_VAR([BDB_CFLAGS], [C compiler flags for BerkeleyDB, bypasses autodetection]) AC_ARG_VAR([BDB_LIBS], [Linker flags for BerkeleyDB, bypasses autodetection]) @@ -52,7 +52,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[ AC_MSG_WARN(AC_PACKAGE_NAME[ requires this library for BDB (legacy) wallet support]) AC_MSG_WARN([Passing --without-bdb will suppress this warning]) elif test "$bdb48path" = "X"; then - BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx) + VINCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx) AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[ AC_MSG_WARN([Found Berkeley DB other than 4.8]) AC_MSG_WARN([BDB (legacy) wallets opened by this build will not be portable!]) @@ -65,7 +65,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[ use_bdb=no ]) else - BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx) + VINCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx) bdbpath="${bdb48path}" use_bdb=yes fi diff --git a/build-aux/m4/vincoin_qt.m4 b/build-aux/m4/vincoin_qt.m4 index 778624239a02d..247b53210c3ce 100644 --- a/build-aux/m4/vincoin_qt.m4 +++ b/build-aux/m4/vincoin_qt.m4 @@ -4,7 +4,7 @@ dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. dnl Helper for cases where a qt dependency is not met. dnl Output: If qt version is auto, set vincoin_enable_qt to false. Else, exit. -AC_DEFUN([BITCOIN_QT_FAIL],[ +AC_DEFUN([VINCOIN_QT_FAIL],[ if test "$vincoin_qt_want_version" = "auto" && test "$vincoin_qt_force" != "yes"; then if test "$vincoin_enable_qt" != "no"; then AC_MSG_WARN([$1; vincoin-qt frontend will not be built]) @@ -16,7 +16,7 @@ AC_DEFUN([BITCOIN_QT_FAIL],[ fi ]) -AC_DEFUN([BITCOIN_QT_CHECK],[ +AC_DEFUN([VINCOIN_QT_CHECK],[ if test "$vincoin_enable_qt" != "no" && test "$vincoin_qt_want_version" != "no"; then true $1 @@ -26,31 +26,31 @@ AC_DEFUN([BITCOIN_QT_CHECK],[ fi ]) -dnl BITCOIN_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing]) +dnl VINCOIN_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing]) dnl Helper for finding the path of programs needed for Qt. dnl Inputs: $1: Variable to be set dnl Inputs: $2: List of programs to search for dnl Inputs: $3: Look for $2 here before $PATH dnl Inputs: $4: If "yes", don't fail if $2 is not found. dnl Output: $1 is set to the path of $2 if found. $2 are searched in order. -AC_DEFUN([BITCOIN_QT_PATH_PROGS],[ - BITCOIN_QT_CHECK([ +AC_DEFUN([VINCOIN_QT_PATH_PROGS],[ + VINCOIN_QT_CHECK([ if test "$3" != ""; then AC_PATH_PROGS([$1], [$2], [], [$3]) else AC_PATH_PROGS([$1], [$2]) fi if test "$$1" = "" && test "$4" != "yes"; then - BITCOIN_QT_FAIL([$1 not found]) + VINCOIN_QT_FAIL([$1 not found]) fi ]) ]) dnl Initialize qt input. -dnl This must be called before any other BITCOIN_QT* macros to ensure that +dnl This must be called before any other VINCOIN_QT* macros to ensure that dnl input variables are set correctly. dnl CAUTION: Do not use this inside of a conditional. -AC_DEFUN([BITCOIN_QT_INIT],[ +AC_DEFUN([VINCOIN_QT_INIT],[ dnl enable qt support AC_ARG_WITH([gui], [AS_HELP_STRING([--with-gui@<:@=no|qt5|auto@:>@], @@ -98,29 +98,29 @@ AC_DEFUN([BITCOIN_QT_INIT],[ dnl Find Qt libraries and includes. dnl -dnl BITCOIN_QT_CONFIGURE([MINIMUM-VERSION]) +dnl VINCOIN_QT_CONFIGURE([MINIMUM-VERSION]) dnl -dnl Outputs: See _BITCOIN_QT_FIND_LIBS +dnl Outputs: See _VINCOIN_QT_FIND_LIBS dnl Outputs: Sets variables for all qt-related tools. dnl Outputs: vincoin_enable_qt, vincoin_enable_qt_dbus, vincoin_enable_qt_test -AC_DEFUN([BITCOIN_QT_CONFIGURE],[ +AC_DEFUN([VINCOIN_QT_CONFIGURE],[ qt_version=">= $1" qt_lib_prefix="Qt5" - BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS]) + VINCOIN_QT_CHECK([_VINCOIN_QT_FIND_LIBS]) dnl This is ugly and complicated. Yuck. Works as follows: dnl We check a header to find out whether Qt is built statically. dnl When Qt is built statically, some plugins must be linked into - dnl the final binary as well. _BITCOIN_QT_CHECK_STATIC_PLUGIN does + dnl the final binary as well. _VINCOIN_QT_CHECK_STATIC_PLUGIN does dnl a quick link-check and appends the results to QT_LIBS. - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ TEMP_CPPFLAGS=$CPPFLAGS TEMP_CXXFLAGS=$CXXFLAGS CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS" CXXFLAGS="$PIC_FLAGS $CORE_CXXFLAGS $CXXFLAGS" - _BITCOIN_QT_IS_STATIC + _VINCOIN_QT_IS_STATIC if test "$vincoin_cv_static_qt" = "yes"; then - _BITCOIN_QT_CHECK_STATIC_LIBS + _VINCOIN_QT_CHECK_STATIC_LIBS if test "$qt_plugin_path" != ""; then if test -d "$qt_plugin_path/platforms"; then @@ -139,26 +139,26 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ AC_DEFINE([QT_STATICPLUGIN], [1], [Define this symbol if qt plugins are static]) if test "$TARGET_OS" != "android"; then - _BITCOIN_QT_CHECK_STATIC_PLUGIN([QMinimalIntegrationPlugin], [-lqminimal]) + _VINCOIN_QT_CHECK_STATIC_PLUGIN([QMinimalIntegrationPlugin], [-lqminimal]) AC_DEFINE([QT_QPA_PLATFORM_MINIMAL], [1], [Define this symbol if the minimal qt platform exists]) fi if test "$TARGET_OS" = "windows"; then dnl Linking against wtsapi32 is required. See #17749 and dnl https://bugreports.qt.io/browse/QTBUG-27097. AX_CHECK_LINK_FLAG([-lwtsapi32], [QT_LIBS="$QT_LIBS -lwtsapi32"], [AC_MSG_ERROR([could not link against -lwtsapi32])]) - _BITCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsIntegrationPlugin], [-lqwindows]) - _BITCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsVistaStylePlugin], [-lqwindowsvistastyle]) + _VINCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsIntegrationPlugin], [-lqwindows]) + _VINCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsVistaStylePlugin], [-lqwindowsvistastyle]) AC_DEFINE([QT_QPA_PLATFORM_WINDOWS], [1], [Define this symbol if the qt platform is windows]) elif test "$TARGET_OS" = "linux"; then - _BITCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb]) + _VINCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb]) AC_DEFINE([QT_QPA_PLATFORM_XCB], [1], [Define this symbol if the qt platform is xcb]) elif test "$TARGET_OS" = "darwin"; then AX_CHECK_LINK_FLAG([-framework Carbon], [QT_LIBS="$QT_LIBS -framework Carbon"], [AC_MSG_ERROR(could not link against Carbon framework)]) AX_CHECK_LINK_FLAG([-framework IOSurface], [QT_LIBS="$QT_LIBS -framework IOSurface"], [AC_MSG_ERROR(could not link against IOSurface framework)]) AX_CHECK_LINK_FLAG([-framework Metal], [QT_LIBS="$QT_LIBS -framework Metal"], [AC_MSG_ERROR(could not link against Metal framework)]) AX_CHECK_LINK_FLAG([-framework QuartzCore], [QT_LIBS="$QT_LIBS -framework QuartzCore"], [AC_MSG_ERROR(could not link against QuartzCore framework)]) - _BITCOIN_QT_CHECK_STATIC_PLUGIN([QCocoaIntegrationPlugin], [-lqcocoa]) - _BITCOIN_QT_CHECK_STATIC_PLUGIN([QMacStylePlugin], [-lqmacstyle]) + _VINCOIN_QT_CHECK_STATIC_PLUGIN([QCocoaIntegrationPlugin], [-lqcocoa]) + _VINCOIN_QT_CHECK_STATIC_PLUGIN([QMacStylePlugin], [-lqmacstyle]) AC_DEFINE([QT_QPA_PLATFORM_COCOA], [1], [Define this symbol if the qt platform is cocoa]) elif test "$TARGET_OS" = "android"; then QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lplugins_platforms_qtforandroid${qt_lib_suffix} -ljnigraphics -landroid -lqtfreetype${qt_lib_suffix} $QT_LIBS" @@ -174,7 +174,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ fi if test "$use_hardening" != "no"; then - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ AC_MSG_CHECKING([whether -fPIE can be used with this Qt config]) TEMP_CPPFLAGS=$CPPFLAGS TEMP_CXXFLAGS=$CXXFLAGS @@ -198,7 +198,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ CXXFLAGS=$TEMP_CXXFLAGS ]) else - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ AC_MSG_CHECKING([whether -fPIC is needed with this Qt config]) TEMP_CPPFLAGS=$CPPFLAGS CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS" @@ -220,24 +220,24 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ ]) fi - BITCOIN_QT_PATH_PROGS([MOC], [moc-qt5 moc5 moc], $qt_bin_path) - BITCOIN_QT_PATH_PROGS([UIC], [uic-qt5 uic5 uic], $qt_bin_path) - BITCOIN_QT_PATH_PROGS([RCC], [rcc-qt5 rcc5 rcc], $qt_bin_path) - BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt5 lrelease5 lrelease], $qt_bin_path) - BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt5 lupdate5 lupdate],$qt_bin_path, yes) - BITCOIN_QT_PATH_PROGS([LCONVERT], [lconvert-qt5 lconvert5 lconvert], $qt_bin_path, yes) + VINCOIN_QT_PATH_PROGS([MOC], [moc-qt5 moc5 moc], $qt_bin_path) + VINCOIN_QT_PATH_PROGS([UIC], [uic-qt5 uic5 uic], $qt_bin_path) + VINCOIN_QT_PATH_PROGS([RCC], [rcc-qt5 rcc5 rcc], $qt_bin_path) + VINCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt5 lrelease5 lrelease], $qt_bin_path) + VINCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt5 lupdate5 lupdate],$qt_bin_path, yes) + VINCOIN_QT_PATH_PROGS([LCONVERT], [lconvert-qt5 lconvert5 lconvert], $qt_bin_path, yes) MOC_DEFS='-DHAVE_CONFIG_H -I$(srcdir)' case $host in *darwin*) - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC" base_frameworks="-framework Foundation -framework AppKit" AX_CHECK_LINK_FLAG([$base_frameworks], [QT_LIBS="$QT_LIBS $base_frameworks"], [AC_MSG_ERROR(could not find base frameworks)]) ]) ;; *mingw*) - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ AX_CHECK_LINK_FLAG([-mwindows], [QT_LDFLAGS="$QT_LDFLAGS -mwindows"], [AC_MSG_WARN([-mwindows linker support not detected])]) ]) esac @@ -245,7 +245,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ dnl enable qt support AC_MSG_CHECKING([whether to build ]AC_PACKAGE_NAME[ GUI]) - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ vincoin_enable_qt=yes vincoin_enable_qt_test=yes if test "$have_qt_test" = "no"; then @@ -287,12 +287,12 @@ dnl All macros below are internal and should _not_ be used from configure.ac. dnl Internal. Check if the linked version of Qt was built statically. dnl -dnl _BITCOIN_QT_IS_STATIC +dnl _VINCOIN_QT_IS_STATIC dnl --------------------- dnl dnl Requires: INCLUDES and LIBS must be populated as necessary. dnl Output: vincoin_cv_static_qt=yes|no -AC_DEFUN([_BITCOIN_QT_IS_STATIC],[ +AC_DEFUN([_VINCOIN_QT_IS_STATIC],[ AC_CACHE_CHECK(for static Qt, vincoin_cv_static_qt,[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include @@ -312,14 +312,14 @@ AC_DEFUN([_BITCOIN_QT_IS_STATIC],[ dnl Internal. Check if the link-requirements for a static plugin are met. dnl -dnl _BITCOIN_QT_CHECK_STATIC_PLUGIN(PLUGIN, LIBRARIES) +dnl _VINCOIN_QT_CHECK_STATIC_PLUGIN(PLUGIN, LIBRARIES) dnl -------------------------------------------------- dnl dnl Requires: INCLUDES and LIBS must be populated as necessary. dnl Inputs: $1: A static plugin name. dnl Inputs: $2: The libraries that resolve $1. dnl Output: QT_LIBS is prepended or configure exits. -AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGIN], [ +AC_DEFUN([_VINCOIN_QT_CHECK_STATIC_PLUGIN], [ AC_MSG_CHECKING([for $1 ($2)]) CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS" LIBS="$2${qt_lib_suffix} $QT_LIBS $LIBS" @@ -328,17 +328,17 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGIN], [ Q_IMPORT_PLUGIN($1) ]])], [AC_MSG_RESULT([yes]); QT_LIBS="$2${qt_lib_suffix} $QT_LIBS"], - [AC_MSG_RESULT([no]); BITCOIN_QT_FAIL([$1 not found.])]) + [AC_MSG_RESULT([no]); VINCOIN_QT_FAIL([$1 not found.])]) LIBS="$CHECK_STATIC_PLUGINS_TEMP_LIBS" ]) dnl Internal. Check Qt static libs with PKG_CHECK_MODULES. dnl -dnl _BITCOIN_QT_CHECK_STATIC_LIBS +dnl _VINCOIN_QT_CHECK_STATIC_LIBS dnl ----------------------------- dnl dnl Outputs: QT_LIBS is prepended. -AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_LIBS], [ +AC_DEFUN([_VINCOIN_QT_CHECK_STATIC_LIBS], [ PKG_CHECK_MODULES([QT_ACCESSIBILITY], [${qt_lib_prefix}AccessibilitySupport${qt_lib_suffix}], [QT_LIBS="$QT_ACCESSIBILITY_LIBS $QT_LIBS"]) PKG_CHECK_MODULES([QT_DEVICEDISCOVERY], [${qt_lib_prefix}DeviceDiscoverySupport${qt_lib_suffix}], [QT_LIBS="$QT_DEVICEDISCOVERY_LIBS $QT_LIBS"]) PKG_CHECK_MODULES([QT_EDID], [${qt_lib_prefix}EdidSupport${qt_lib_suffix}], [QT_LIBS="$QT_EDID_LIBS $QT_LIBS"]) @@ -365,30 +365,30 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_LIBS], [ dnl Internal. Find Qt libraries using pkg-config. dnl -dnl _BITCOIN_QT_FIND_LIBS +dnl _VINCOIN_QT_FIND_LIBS dnl --------------------- dnl dnl Outputs: All necessary QT_* variables are set. dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no. -AC_DEFUN([_BITCOIN_QT_FIND_LIBS],[ - BITCOIN_QT_CHECK([ +AC_DEFUN([_VINCOIN_QT_FIND_LIBS],[ + VINCOIN_QT_CHECK([ PKG_CHECK_MODULES([QT_CORE], [${qt_lib_prefix}Core${qt_lib_suffix} $qt_version], [QT_INCLUDES="$QT_CORE_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_CORE_LIBS $QT_LIBS"], - [BITCOIN_QT_FAIL([${qt_lib_prefix}Core${qt_lib_suffix} $qt_version not found])]) + [VINCOIN_QT_FAIL([${qt_lib_prefix}Core${qt_lib_suffix} $qt_version not found])]) ]) - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ PKG_CHECK_MODULES([QT_GUI], [${qt_lib_prefix}Gui${qt_lib_suffix} $qt_version], [QT_INCLUDES="$QT_GUI_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_GUI_LIBS $QT_LIBS"], - [BITCOIN_QT_FAIL([${qt_lib_prefix}Gui${qt_lib_suffix} $qt_version not found])]) + [VINCOIN_QT_FAIL([${qt_lib_prefix}Gui${qt_lib_suffix} $qt_version not found])]) ]) - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ PKG_CHECK_MODULES([QT_WIDGETS], [${qt_lib_prefix}Widgets${qt_lib_suffix} $qt_version], [QT_INCLUDES="$QT_WIDGETS_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_WIDGETS_LIBS $QT_LIBS"], - [BITCOIN_QT_FAIL([${qt_lib_prefix}Widgets${qt_lib_suffix} $qt_version not found])]) + [VINCOIN_QT_FAIL([${qt_lib_prefix}Widgets${qt_lib_suffix} $qt_version not found])]) ]) - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ PKG_CHECK_MODULES([QT_NETWORK], [${qt_lib_prefix}Network${qt_lib_suffix} $qt_version], [QT_INCLUDES="$QT_NETWORK_CFLAGS $QT_INCLUDES" QT_LIBS="$QT_NETWORK_LIBS $QT_LIBS"], - [BITCOIN_QT_FAIL([${qt_lib_prefix}Network${qt_lib_suffix} $qt_version not found])]) + [VINCOIN_QT_FAIL([${qt_lib_prefix}Network${qt_lib_suffix} $qt_version not found])]) ]) - BITCOIN_QT_CHECK([ + VINCOIN_QT_CHECK([ PKG_CHECK_MODULES([QT_TEST], [${qt_lib_prefix}Test${qt_lib_suffix} $qt_version], [QT_TEST_INCLUDES="$QT_TEST_CFLAGS"; have_qt_test=yes], [have_qt_test=no]) if test "$use_dbus" != "no"; then PKG_CHECK_MODULES([QT_DBUS], [${qt_lib_prefix}DBus $qt_version], [QT_DBUS_INCLUDES="$QT_DBUS_CFLAGS"; have_qt_dbus=yes], [have_qt_dbus=no]) diff --git a/build-aux/m4/vincoin_subdir_to_include.m4 b/build-aux/m4/vincoin_subdir_to_include.m4 index e75c45fb86be6..1894c89897170 100644 --- a/build-aux/m4/vincoin_subdir_to_include.m4 +++ b/build-aux/m4/vincoin_subdir_to_include.m4 @@ -2,9 +2,9 @@ dnl Copyright (c) 2013-2014 The Vincoin Core developers dnl Distributed under the MIT software license, see the accompanying dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. -dnl BITCOIN_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE]) +dnl VINCOIN_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE]) dnl SUBDIRECTORY-NAME must end with a path separator -AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ +AC_DEFUN([VINCOIN_SUBDIR_TO_INCLUDE],[ if test "$2" = ""; then AC_MSG_RESULT([default]) else diff --git a/build_msvc/msvc-autogen.py b/build_msvc/msvc-autogen.py index 8c6ec3fb85270..afcdca59fdfa8 100755 --- a/build_msvc/msvc-autogen.py +++ b/build_msvc/msvc-autogen.py @@ -50,7 +50,7 @@ def parse_makefile(makefile): lib_sources[current_lib] = [] break -def parse_config_into_btc_config(): +def parse_config_into_vnc_config(): def find_between( s, first, last ): try: start = s.index( first ) + len( first ) @@ -82,8 +82,8 @@ def find_between( s, first, last ): if header in config_dict: template[index] = line.replace("$", f"{config_dict[header]}") - with open(os.path.join(SOURCE_DIR,'../build_msvc/vincoin_config.h'), "w", encoding="utf8") as btc_config: - btc_config.writelines(template) + with open(os.path.join(SOURCE_DIR,'../build_msvc/vincoin_config.h'), "w", encoding="utf8") as vnc_config: + vnc_config.writelines(template) def set_properties(vcxproj_filename, placeholder, content): with open(vcxproj_filename + '.in', 'r', encoding='utf-8') as vcxproj_in_file: @@ -109,7 +109,7 @@ def main(): content += ' $(IntDir)' + object_filename + '\n' content += ' \n' set_properties(vcxproj_filename, '@SOURCE_FILES@\n', content) - parse_config_into_btc_config() + parse_config_into_vnc_config() copyfile(os.path.join(SOURCE_DIR,'../build_msvc/vincoin_config.h'), os.path.join(SOURCE_DIR, 'config/vincoin-config.h')) if __name__ == '__main__': diff --git a/build_msvc/vincoin_config.h.in b/build_msvc/vincoin_config.h.in index e11968dbab3e1..9ef1cb96f2298 100644 --- a/build_msvc/vincoin_config.h.in +++ b/build_msvc/vincoin_config.h.in @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_BITCOIN_CONFIG_H -#define BITCOIN_BITCOIN_CONFIG_H +#ifndef VINCOIN_VINCOIN_CONFIG_H +#define VINCOIN_VINCOIN_CONFIG_H /* Version Build */ #define CLIENT_VERSION_BUILD $ @@ -146,4 +146,4 @@ #endif // !WINAPI_FAMILY || WINAPI_FAMILY_DESKTOP_APP -#endif //BITCOIN_BITCOIN_CONFIG_H +#endif //VINCOIN_VINCOIN_CONFIG_H diff --git a/build_msvc/vincoind/vincoind.vcxproj b/build_msvc/vincoind/vincoind.vcxproj index dc5545b5c6496..37f81ca2cf0ab 100644 --- a/build_msvc/vincoind/vincoind.vcxproj +++ b/build_msvc/vincoind/vincoind.vcxproj @@ -72,13 +72,13 @@ + Replace="@BUILD_VINCOIN_CLI_TRUE@" By=""> + Replace="@BUILD_VINCOIN_UTIL_TRUE@" By=""> + Replace="@BUILD_VINCOIN_WALLET_TRUE@" By=""> + Replace="@BUILD_VINCOIND_TRUE@" By=""> 2 is treated like 2 on this platform [-Werror=cpp] -export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports" +export VINCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports" export CONFIG_SHELL="/bin/dash" diff --git a/ci/test/00_setup_env_i686_multiprocess.sh b/ci/test/00_setup_env_i686_multiprocess.sh index 587812933e9ac..2986881832619 100755 --- a/ci/test/00_setup_env_i686_multiprocess.sh +++ b/ci/test/00_setup_env_i686_multiprocess.sh @@ -12,6 +12,6 @@ export CI_IMAGE_NAME_TAG="docker.io/amd64/ubuntu:22.04" export PACKAGES="llvm clang g++-multilib" export DEP_OPTS="DEBUG=1 MULTIPROCESS=1" export GOAL="install" -export BITCOIN_CONFIG="--enable-debug CC='clang -m32' CXX='clang++ -m32' \ +export VINCOIN_CONFIG="--enable-debug CC='clang -m32' CXX='clang++ -m32' \ CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE'" -export BITCOIND=vincoin-node # Used in functional tests +export VINCOIND=vincoin-node # Used in functional tests diff --git a/ci/test/00_setup_env_mac_cross.sh b/ci/test/00_setup_env_mac_cross.sh index bcafad3f694d8..47c618435f5be 100755 --- a/ci/test/00_setup_env_mac_cross.sh +++ b/ci/test/00_setup_env_mac_cross.sh @@ -17,4 +17,4 @@ export XCODE_BUILD_ID=15A240d export RUN_UNIT_TESTS=false export RUN_FUNCTIONAL_TESTS=false export GOAL="deploy" -export BITCOIN_CONFIG="--with-gui --enable-reduce-exports" +export VINCOIN_CONFIG="--with-gui --enable-reduce-exports" diff --git a/ci/test/00_setup_env_mac_native.sh b/ci/test/00_setup_env_mac_native.sh index c7c1181565362..20f27efe6626f 100755 --- a/ci/test/00_setup_env_mac_native.sh +++ b/ci/test/00_setup_env_mac_native.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 export HOST=x86_64-apple-darwin export PIP_PACKAGES="zmq" export GOAL="install" -export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports" +export VINCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports" export CI_OS_NAME="macos" export NO_DEPENDS=1 export OSX_SDK="" diff --git a/ci/test/00_setup_env_native_asan.sh b/ci/test/00_setup_env_native_asan.sh index 622def8ca41cf..4d6c31216dad7 100755 --- a/ci/test/00_setup_env_native_asan.sh +++ b/ci/test/00_setup_env_native_asan.sh @@ -20,7 +20,7 @@ export CONTAINER_NAME=ci_native_asan export PACKAGES="systemtap-sdt-dev clang-17 llvm-17 libclang-rt-17-dev python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}" export NO_DEPENDS=1 export GOAL="install" -export BITCOIN_CONFIG="--enable-c++20 --enable-usdt --enable-zmq --with-incompatible-bdb --with-gui=qt5 \ +export VINCOIN_CONFIG="--enable-c++20 --enable-usdt --enable-zmq --with-incompatible-bdb --with-gui=qt5 \ CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' \ --with-sanitizers=address,float-divide-by-zero,integer,undefined \ CC='clang-17 -ftrivial-auto-var-init=pattern' CXX='clang++-17 -ftrivial-auto-var-init=pattern'" diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh index d5255b740a526..d5a1ccd5a510e 100755 --- a/ci/test/00_setup_env_native_fuzz.sh +++ b/ci/test/00_setup_env_native_fuzz.sh @@ -15,7 +15,7 @@ export RUN_FUNCTIONAL_TESTS=false export RUN_FUZZ_TESTS=true export GOAL="install" export CI_CONTAINER_CAP="--cap-add SYS_PTRACE" # If run with (ASan + LSan), the container needs access to ptrace (https://github.com/google/sanitizers/issues/764) -export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined,float-divide-by-zero,integer \ +export VINCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined,float-divide-by-zero,integer \ CC='clang-17 -ftrivial-auto-var-init=pattern' CXX='clang++-17 -ftrivial-auto-var-init=pattern'" export CCACHE_MAXSIZE=200M export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-17" diff --git a/ci/test/00_setup_env_native_fuzz_with_msan.sh b/ci/test/00_setup_env_native_fuzz_with_msan.sh index b2a68c32dc8cd..289c767ebe5c2 100755 --- a/ci/test/00_setup_env_native_fuzz_with_msan.sh +++ b/ci/test/00_setup_env_native_fuzz_with_msan.sh @@ -17,7 +17,7 @@ export PACKAGES="ninja-build" # BDB generates false-positives and will be removed in future export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'" export GOAL="install" -export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,memory --disable-hardening --with-asm=no CFLAGS='${MSAN_FLAGS}' CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'" +export VINCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,memory --disable-hardening --with-asm=no CFLAGS='${MSAN_FLAGS}' CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'" export USE_MEMORY_SANITIZER="true" export RUN_UNIT_TESTS="false" export RUN_FUNCTIONAL_TESTS="false" diff --git a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh index 566893667987c..04161d38ad6c6 100755 --- a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh +++ b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh @@ -16,5 +16,5 @@ export RUN_FUZZ_TESTS=true export FUZZ_TESTS_CONFIG="--valgrind" export GOAL="install" # Temporarily pin dwarf 4, until using Valgrind 3.20 or later -export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++ CFLAGS=-gdwarf-4 CXXFLAGS=-gdwarf-4" +export VINCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++ CFLAGS=-gdwarf-4 CXXFLAGS=-gdwarf-4" export CCACHE_MAXSIZE=200M diff --git a/ci/test/00_setup_env_native_msan.sh b/ci/test/00_setup_env_native_msan.sh index a109580e92f9c..e551aa5e2f313 100755 --- a/ci/test/00_setup_env_native_msan.sh +++ b/ci/test/00_setup_env_native_msan.sh @@ -17,7 +17,7 @@ export PACKAGES="ninja-build" # BDB generates false-positives and will be removed in future export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'" export GOAL="install" -export BITCOIN_CONFIG="--with-sanitizers=memory --disable-hardening --with-asm=no CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'" +export VINCOIN_CONFIG="--with-sanitizers=memory --disable-hardening --with-asm=no CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'" export USE_MEMORY_SANITIZER="true" export RUN_FUNCTIONAL_TESTS="false" export CCACHE_MAXSIZE=250M diff --git a/ci/test/00_setup_env_native_nowallet_libvincoinkernel.sh b/ci/test/00_setup_env_native_nowallet_libvincoinkernel.sh index 153638c089be2..591de71718c25 100755 --- a/ci/test/00_setup_env_native_nowallet_libvincoinkernel.sh +++ b/ci/test/00_setup_env_native_nowallet_libvincoinkernel.sh @@ -12,4 +12,4 @@ export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04" export PACKAGES="python3-zmq clang-14 llvm-14 libc++abi-14-dev libc++-14-dev" export DEP_OPTS="NO_WALLET=1 CC=clang-14 CXX='clang++-14 -stdlib=libc++'" export GOAL="install" -export BITCOIN_CONFIG="--enable-reduce-exports --enable-experimental-util-chainstate --with-experimental-kernel-lib --enable-shared" +export VINCOIN_CONFIG="--enable-reduce-exports --enable-experimental-util-chainstate --with-experimental-kernel-lib --enable-shared" diff --git a/ci/test/00_setup_env_native_previous_releases.sh b/ci/test/00_setup_env_native_previous_releases.sh index f5bbaaea25b23..550a8c828fafc 100755 --- a/ci/test/00_setup_env_native_previous_releases.sh +++ b/ci/test/00_setup_env_native_previous_releases.sh @@ -16,5 +16,5 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true" export RUN_UNIT_TESTS="false" export GOAL="install" export DOWNLOAD_PREVIOUS_RELEASES="true" -export BITCOIN_CONFIG="--enable-zmq --with-libs=no --with-gui=qt5 --enable-reduce-exports --enable-debug \ +export VINCOIN_CONFIG="--enable-zmq --with-libs=no --with-gui=qt5 --enable-reduce-exports --enable-debug \ CFLAGS=\"-g0 -O2 -funsigned-char\" CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE' CXXFLAGS=\"-g0 -O2 -funsigned-char\"" diff --git a/ci/test/00_setup_env_native_tidy.sh b/ci/test/00_setup_env_native_tidy.sh index 4946992901a22..16e305ddeddcf 100755 --- a/ci/test/00_setup_env_native_tidy.sh +++ b/ci/test/00_setup_env_native_tidy.sh @@ -16,5 +16,5 @@ export RUN_FUNCTIONAL_TESTS=false export RUN_FUZZ_TESTS=false export RUN_TIDY=true export GOAL="install" -export BITCOIN_CONFIG="CC=clang-${TIDY_LLVM_V} CXX=clang++-${TIDY_LLVM_V} --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -I/usr/lib/llvm-${TIDY_LLVM_V}/lib/clang/${TIDY_LLVM_V}/include'" +export VINCOIN_CONFIG="CC=clang-${TIDY_LLVM_V} CXX=clang++-${TIDY_LLVM_V} --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -I/usr/lib/llvm-${TIDY_LLVM_V}/lib/clang/${TIDY_LLVM_V}/include'" export CCACHE_MAXSIZE=200M diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index 8f581a0ce5d08..b444564c2633b 100755 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -11,4 +11,4 @@ export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04" export PACKAGES="clang-17 llvm-17 libclang-rt-17-dev libc++abi-17-dev libc++-17-dev python3-zmq" export DEP_OPTS="CC=clang-17 CXX='clang++-17 -stdlib=libc++'" export GOAL="install" -export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread" +export VINCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread" diff --git a/ci/test/00_setup_env_native_valgrind.sh b/ci/test/00_setup_env_native_valgrind.sh index f2384b87b5392..f1b63a24e25b0 100755 --- a/ci/test/00_setup_env_native_valgrind.sh +++ b/ci/test/00_setup_env_native_valgrind.sh @@ -14,4 +14,4 @@ export NO_DEPENDS=1 export TEST_RUNNER_EXTRA="--exclude feature_init,rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/vincoin/vincoin/issues/17765#issuecomment-602068547 export GOAL="install" # Temporarily pin dwarf 4, until using Valgrind 3.20 or later -export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++ CFLAGS=-gdwarf-4 CXXFLAGS=-gdwarf-4" # TODO enable GUI +export VINCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++ CFLAGS=-gdwarf-4 CXXFLAGS=-gdwarf-4" # TODO enable GUI diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh index d2fcb622cc90e..9131bebe2f25c 100755 --- a/ci/test/00_setup_env_s390x.sh +++ b/ci/test/00_setup_env_s390x.sh @@ -13,4 +13,4 @@ export CI_IMAGE_NAME_TAG="docker.io/s390x/debian:bookworm" export TEST_RUNNER_EXTRA="--exclude feature_init,rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/vincoin/vincoin/issues/17765#issuecomment-602068547 export RUN_FUNCTIONAL_TESTS=true export GOAL="install" -export BITCOIN_CONFIG="--enable-reduce-exports" +export VINCOIN_CONFIG="--enable-reduce-exports" diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index af640a05b1e71..23d0d139d43c8 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -16,4 +16,4 @@ export GOAL="deploy" # Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when # cross-compiling for Windows. https://sourceforge.net/p/mingw-w64/bugs/306/ # https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe -export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests CXXFLAGS=-Wno-return-type" +export VINCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests CXXFLAGS=-Wno-return-type" diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh index edb0c468ddee9..32dd102b35b5e 100755 --- a/ci/test/03_test_script.sh +++ b/ci/test/03_test_script.sh @@ -101,12 +101,12 @@ if [ "$DOWNLOAD_PREVIOUS_RELEASES" = "true" ]; then test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR" fi -BITCOIN_CONFIG_ALL="--disable-dependency-tracking" +VINCOIN_CONFIG_ALL="--disable-dependency-tracking" if [ -z "$NO_DEPENDS" ]; then - BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} CONFIG_SITE=$DEPENDS_DIR/$HOST/share/config.site" + VINCOIN_CONFIG_ALL="${VINCOIN_CONFIG_ALL} CONFIG_SITE=$DEPENDS_DIR/$HOST/share/config.site" fi if [ -z "$NO_WERROR" ]; then - BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror" + VINCOIN_CONFIG_ALL="${VINCOIN_CONFIG_ALL} --enable-werror" fi ccache --zero-stats @@ -115,13 +115,13 @@ PRINT_CCACHE_STATISTICS="ccache --version | head -n 1 && ccache --show-stats" if [ -n "$ANDROID_TOOLS_URL" ]; then make distclean || true ./autogen.sh - bash -c "./configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false) + bash -c "./configure $VINCOIN_CONFIG_ALL $VINCOIN_CONFIG" || ( (cat config.log) && false) make "${MAKEJOBS}" && cd src/qt && ANDROID_HOME=${ANDROID_HOME} ANDROID_NDK_HOME=${ANDROID_NDK_HOME} make apk bash -c "${PRINT_CCACHE_STATISTICS}" exit 0 fi -BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --prefix=$BASE_OUTDIR" +VINCOIN_CONFIG_ALL="${VINCOIN_CONFIG_ALL} --enable-external-signer --prefix=$BASE_OUTDIR" if [ -n "$CONFIG_SHELL" ]; then "$CONFIG_SHELL" -c "./autogen.sh" @@ -132,13 +132,13 @@ fi mkdir -p "${BASE_BUILD_DIR}" cd "${BASE_BUILD_DIR}" -bash -c "${BASE_ROOT_DIR}/configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false) +bash -c "${BASE_ROOT_DIR}/configure --cache-file=config.cache $VINCOIN_CONFIG_ALL $VINCOIN_CONFIG" || ( (cat config.log) && false) make distdir VERSION="$HOST" cd "${BASE_BUILD_DIR}/vincoin-$HOST" -bash -c "./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false) +bash -c "./configure --cache-file=../config.cache $VINCOIN_CONFIG_ALL $VINCOIN_CONFIG" || ( (cat config.log) && false) if [[ "${RUN_TIDY}" == "true" ]]; then MAYBE_BEAR="bear --config src/.bear-tidy-config" diff --git a/configure.ac b/configure.ac index 720bf866ed2a9..61b5abec77ec0 100644 --- a/configure.ac +++ b/configure.ac @@ -29,17 +29,17 @@ if test -n "$PKG_CONFIG_LIBDIR"; then PKG_CONFIG="env PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR $PKG_CONFIG" fi -BITCOIN_DAEMON_NAME=vincoind -BITCOIN_GUI_NAME=vincoin-qt -BITCOIN_TEST_NAME=test_vincoin -BITCOIN_CLI_NAME=vincoin-cli -BITCOIN_TX_NAME=vincoin-tx -BITCOIN_UTIL_NAME=vincoin-util -BITCOIN_CHAINSTATE_NAME=vincoin-chainstate -BITCOIN_WALLET_TOOL_NAME=vincoin-wallet +VINCOIN_DAEMON_NAME=vincoind +VINCOIN_GUI_NAME=vincoin-qt +VINCOIN_TEST_NAME=test_vincoin +VINCOIN_CLI_NAME=vincoin-cli +VINCOIN_TX_NAME=vincoin-tx +VINCOIN_UTIL_NAME=vincoin-util +VINCOIN_CHAINSTATE_NAME=vincoin-chainstate +VINCOIN_WALLET_TOOL_NAME=vincoin-wallet dnl Multi Process -BITCOIN_MP_NODE_NAME=vincoin-node -BITCOIN_MP_GUI_NAME=vincoin-gui +VINCOIN_MP_NODE_NAME=vincoin-node +VINCOIN_MP_GUI_NAME=vincoin-gui dnl Unless the user specified ARFLAGS, force it to be cr dnl This is also the default as-of libtool 2.4.7 @@ -50,9 +50,9 @@ fi AC_CANONICAL_HOST -AH_TOP([#ifndef BITCOIN_CONFIG_H]) -AH_TOP([#define BITCOIN_CONFIG_H]) -AH_BOTTOM([#endif //BITCOIN_CONFIG_H]) +AH_TOP([#ifndef VINCOIN_CONFIG_H]) +AH_TOP([#define VINCOIN_CONFIG_H]) +AH_BOTTOM([#endif //VINCOIN_CONFIG_H]) dnl Automake init set-up and checks AM_INIT_AUTOMAKE([1.13 no-define subdir-objects foreign]) @@ -736,7 +736,7 @@ case $host in if test "$use_bdb" != "no" && $BREW list --versions berkeley-db@4 >/dev/null && test "$BDB_CFLAGS" = "" && test "$BDB_LIBS" = ""; then bdb_prefix=$($BREW --prefix berkeley-db@4 2>/dev/null) - dnl This must precede the call to BITCOIN_FIND_BDB48 below. + dnl This must precede the call to VINCOIN_FIND_BDB48 below. BDB_CFLAGS="-I$bdb_prefix/include" BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8" fi @@ -1286,10 +1286,10 @@ if test "$enable_fuzz" = "yes"; then AX_CHECK_PREPROC_FLAG([-DABORT_ON_FAILED_ASSUME], [DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -DABORT_ON_FAILED_ASSUME"], [], [$CXXFLAG_WERROR]) else - BITCOIN_QT_INIT + VINCOIN_QT_INIT dnl sets $vincoin_enable_qt, $vincoin_enable_qt_test, $vincoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([5.11.3]) + VINCOIN_QT_CONFIGURE([5.11.3]) dnl Keep a copy of the original $QT_INCLUDES and use it when invoking qt's moc QT_INCLUDES_UNSUPPRESSED=$QT_INCLUDES @@ -1320,7 +1320,7 @@ fi if test "$enable_wallet" != "no"; then dnl Check for libdb_cxx only if wallet enabled if test "$use_bdb" != "no"; then - BITCOIN_FIND_BDB48 + VINCOIN_FIND_BDB48 if test "$suppress_external_warnings" != "no" ; then BDB_CPPFLAGS=SUPPRESS_WARNINGS($BDB_CPPFLAGS) fi @@ -1553,7 +1553,7 @@ fi dnl QR Code encoding library check if test "$use_qr" != "no"; then - BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) + VINCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) fi dnl ZMQ check @@ -1602,8 +1602,8 @@ else fi AM_CONDITIONAL([BUILD_MULTIPROCESS], [test "$build_multiprocess" = "yes"]) -AM_CONDITIONAL([BUILD_BITCOIN_NODE], [test "$build_multiprocess" = "yes"]) -AM_CONDITIONAL([BUILD_BITCOIN_GUI], [test "$build_multiprocess" = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIN_NODE], [test "$build_multiprocess" = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIN_GUI], [test "$build_multiprocess" = "yes"]) dnl codegen tools check @@ -1617,23 +1617,23 @@ if test "$build_multiprocess" != "no"; then fi AC_MSG_CHECKING([whether to build vincoind]) -AM_CONDITIONAL([BUILD_BITCOIND], [test $build_vincoind = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIND], [test $build_vincoind = "yes"]) AC_MSG_RESULT($build_vincoind) AC_MSG_CHECKING([whether to build vincoin-cli]) -AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test $build_vincoin_cli = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIN_CLI], [test $build_vincoin_cli = "yes"]) AC_MSG_RESULT($build_vincoin_cli) AC_MSG_CHECKING([whether to build vincoin-tx]) -AM_CONDITIONAL([BUILD_BITCOIN_TX], [test $build_vincoin_tx = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIN_TX], [test $build_vincoin_tx = "yes"]) AC_MSG_RESULT($build_vincoin_tx) AC_MSG_CHECKING([whether to build vincoin-wallet]) -AM_CONDITIONAL([BUILD_BITCOIN_WALLET], [test $build_vincoin_wallet = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIN_WALLET], [test $build_vincoin_wallet = "yes"]) AC_MSG_RESULT($build_vincoin_wallet) AC_MSG_CHECKING([whether to build vincoin-util]) -AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test $build_vincoin_util = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIN_UTIL], [test $build_vincoin_util = "yes"]) AC_MSG_RESULT($build_vincoin_util) AC_MSG_CHECKING([whether to build experimental vincoin-chainstate]) @@ -1642,18 +1642,18 @@ if test "$build_vincoin_chainstate" = "yes"; then AC_MSG_ERROR([experimental vincoin-chainstate cannot be built without the experimental vincoinkernel library. Use --with-experimental-kernel-lib]); fi fi -AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_vincoin_chainstate = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIN_CHAINSTATE], [test $build_vincoin_chainstate = "yes"]) AC_MSG_RESULT($build_vincoin_chainstate) AC_MSG_CHECKING([whether to build libraries]) -AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test $build_vincoin_libs = "yes"]) +AM_CONDITIONAL([BUILD_VINCOIN_LIBS], [test $build_vincoin_libs = "yes"]) if test "$build_vincoin_libs" = "yes"; then AC_DEFINE([HAVE_CONSENSUS_LIB], [1], [Define this symbol if the consensus lib has been built]) AC_CONFIG_FILES([libvincoinconsensus.pc:libvincoinconsensus.pc.in]) fi -AM_CONDITIONAL([BUILD_BITCOIN_KERNEL_LIB], [test "$build_experimental_kernel_lib" != "no" && ( test "$build_experimental_kernel_lib" = "yes" || test "$build_vincoin_chainstate" = "yes" )]) +AM_CONDITIONAL([BUILD_VINCOIN_KERNEL_LIB], [test "$build_experimental_kernel_lib" != "no" && ( test "$build_experimental_kernel_lib" = "yes" || test "$build_vincoin_chainstate" = "yes" )]) AC_MSG_RESULT($build_vincoin_libs) @@ -1843,16 +1843,16 @@ AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR) AC_SUBST(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS") AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION") AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL") -AC_SUBST(BITCOIN_DAEMON_NAME) -AC_SUBST(BITCOIN_GUI_NAME) -AC_SUBST(BITCOIN_TEST_NAME) -AC_SUBST(BITCOIN_CLI_NAME) -AC_SUBST(BITCOIN_TX_NAME) -AC_SUBST(BITCOIN_UTIL_NAME) -AC_SUBST(BITCOIN_CHAINSTATE_NAME) -AC_SUBST(BITCOIN_WALLET_TOOL_NAME) -AC_SUBST(BITCOIN_MP_NODE_NAME) -AC_SUBST(BITCOIN_MP_GUI_NAME) +AC_SUBST(VINCOIN_DAEMON_NAME) +AC_SUBST(VINCOIN_GUI_NAME) +AC_SUBST(VINCOIN_TEST_NAME) +AC_SUBST(VINCOIN_CLI_NAME) +AC_SUBST(VINCOIN_TX_NAME) +AC_SUBST(VINCOIN_UTIL_NAME) +AC_SUBST(VINCOIN_CHAINSTATE_NAME) +AC_SUBST(VINCOIN_WALLET_TOOL_NAME) +AC_SUBST(VINCOIN_MP_NODE_NAME) +AC_SUBST(VINCOIN_MP_GUI_NAME) AC_SUBST(RELDFLAGS) AC_SUBST(CORE_LDFLAGS) diff --git a/contrib/devtools/gen-vincoin-conf.sh b/contrib/devtools/gen-vincoin-conf.sh index 6ce4d71be487a..56af73b824eed 100755 --- a/contrib/devtools/gen-vincoin-conf.sh +++ b/contrib/devtools/gen-vincoin-conf.sh @@ -7,22 +7,22 @@ export LC_ALL=C TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} BUILDDIR=${BUILDDIR:-$TOPDIR} BINDIR=${BINDIR:-$BUILDDIR/src} -BITCOIND=${BITCOIND:-$BINDIR/vincoind} +VINCOIND=${VINCOIND:-$BINDIR/vincoind} SHARE_EXAMPLES_DIR=${SHARE_EXAMPLES_DIR:-$TOPDIR/share/examples} EXAMPLE_CONF_FILE=${EXAMPLE_CONF_FILE:-$SHARE_EXAMPLES_DIR/vincoin.conf} -[ ! -x "$BITCOIND" ] && echo "$BITCOIND not found or not executable." && exit 1 +[ ! -x "$VINCOIND" ] && echo "$VINCOIND not found or not executable." && exit 1 DIRTY="" -VERSION_OUTPUT=$($BITCOIND --version) +VERSION_OUTPUT=$($VINCOIND --version) if [[ $VERSION_OUTPUT == *"dirty"* ]]; then - DIRTY="${DIRTY}${BITCOIND}\n" + DIRTY="${DIRTY}${VINCOIND}\n" fi if [ -n "$DIRTY" ] then - echo -e "WARNING: $BITCOIND was built from a dirty tree.\n" - echo -e "To safely generate a vincoin.conf file, please commit your changes to $BITCOIND, rebuild, then run this script again.\n" + echo -e "WARNING: $VINCOIND was built from a dirty tree.\n" + echo -e "To safely generate a vincoin.conf file, please commit your changes to $VINCOIND, rebuild, then run this script again.\n" fi echo 'Generating example vincoin.conf file in share/examples/' @@ -49,7 +49,7 @@ EOF # parse the output from vincoind --help # adding newlines is a bit funky to ensure portability for BSD # see here for more details: https://stackoverflow.com/a/24575385 -${BITCOIND} --help \ +${VINCOIND} --help \ | sed '1,/Print this help message and exit/d' \ | sed -E 's/^[[:space:]]{2}\-/#/' \ | sed -E 's/^[[:space:]]{7}/# /' \ diff --git a/contrib/devtools/test_deterministic_coverage.sh b/contrib/devtools/test_deterministic_coverage.sh index 1a3cd248ec612..d52e9b9babf55 100755 --- a/contrib/devtools/test_deterministic_coverage.sh +++ b/contrib/devtools/test_deterministic_coverage.sh @@ -34,7 +34,7 @@ NON_DETERMINISTIC_TESTS=( "wallet_tests/wallet_disableprivkeys" # validation.cpp: if (GetMainSignals().CallbacksPending() > 10) ) -TEST_BITCOIN_BINARY="src/test/test_vincoin" +TEST_VINCOIN_BINARY="src/test/test_vincoin" print_usage() { echo "Usage: $0 [custom test filter (default: all but known non-deterministic tests)] [number of test runs (default: 2)]" @@ -80,8 +80,8 @@ if ! command -v gcovr > /dev/null; then exit 1 fi -if [[ ! -e ${TEST_BITCOIN_BINARY} ]]; then - echo "Error: Executable ${TEST_BITCOIN_BINARY} not found. Run \"./configure --enable-lcov\" and compile." +if [[ ! -e ${TEST_VINCOIN_BINARY} ]]; then + echo "Error: Executable ${TEST_VINCOIN_BINARY} not found. Run \"./configure --enable-lcov\" and compile." exit 1 fi @@ -108,7 +108,7 @@ while [[ ${TEST_RUN_ID} -lt ${N_TEST_RUNS} ]]; do exit 1 fi TEST_OUTPUT_TEMPFILE=$(mktemp) - if ! BOOST_TEST_RUN_FILTERS="${BOOST_TEST_RUN_FILTERS}" ${TEST_BITCOIN_BINARY} > "${TEST_OUTPUT_TEMPFILE}" 2>&1; then + if ! BOOST_TEST_RUN_FILTERS="${BOOST_TEST_RUN_FILTERS}" ${TEST_VINCOIN_BINARY} > "${TEST_OUTPUT_TEMPFILE}" 2>&1; then cat "${TEST_OUTPUT_TEMPFILE}" rm "${TEST_OUTPUT_TEMPFILE}" exit 1 diff --git a/contrib/devtools/utxo_snapshot.sh b/contrib/devtools/utxo_snapshot.sh index d266e5f2f1d7b..2d1a87d5aa492 100755 --- a/contrib/devtools/utxo_snapshot.sh +++ b/contrib/devtools/utxo_snapshot.sh @@ -26,10 +26,10 @@ fi GENERATE_AT_HEIGHT="${1}"; shift; OUTPUT_PATH="${1}"; shift; # Most of the calls we make take a while to run, so pad with a lengthy timeout. -BITCOIN_CLI_CALL="${*} -rpcclienttimeout=9999999" +VINCOIN_CLI_CALL="${*} -rpcclienttimeout=9999999" # Check if the node is pruned and get the pruned block height -PRUNED=$( ${BITCOIN_CLI_CALL} getblockchaininfo | awk '/pruneheight/ {print $2}' | tr -d ',' ) +PRUNED=$( ${VINCOIN_CLI_CALL} getblockchaininfo | awk '/pruneheight/ {print $2}' | tr -d ',' ) if (( GENERATE_AT_HEIGHT < PRUNED )); then echo "Error: The requested snapshot height (${GENERATE_AT_HEIGHT}) should be greater than the pruned block height (${PRUNED})." @@ -50,11 +50,11 @@ fi function cleanup { (>&2 echo "Restoring chain to original height; this may take a while") - ${BITCOIN_CLI_CALL} reconsiderblock "${PIVOT_BLOCKHASH}" + ${VINCOIN_CLI_CALL} reconsiderblock "${PIVOT_BLOCKHASH}" if $NETWORK_DISABLED; then (>&2 echo "Restoring network activity") - ${BITCOIN_CLI_CALL} setnetworkactive true + ${VINCOIN_CLI_CALL} setnetworkactive true fi } @@ -70,25 +70,25 @@ if [[ "$REPLY" =~ ^[Yy]*$ || -z "$REPLY" ]]; then # User input is "Y", "y", or Enter key, proceed with the action NETWORK_DISABLED=true (>&2 echo "Disabling network activity") - ${BITCOIN_CLI_CALL} setnetworkactive false + ${VINCOIN_CLI_CALL} setnetworkactive false else (>&2 echo "Network activity remains enabled") fi # Block we'll invalidate/reconsider to rewind/fast-forward the chain. -PIVOT_BLOCKHASH=$($BITCOIN_CLI_CALL getblockhash $(( GENERATE_AT_HEIGHT + 1 )) ) +PIVOT_BLOCKHASH=$($VINCOIN_CLI_CALL getblockhash $(( GENERATE_AT_HEIGHT + 1 )) ) # Trap for normal exit and Ctrl-C trap cleanup EXIT trap early_exit INT (>&2 echo "Rewinding chain back to height ${GENERATE_AT_HEIGHT} (by invalidating ${PIVOT_BLOCKHASH}); this may take a while") -${BITCOIN_CLI_CALL} invalidateblock "${PIVOT_BLOCKHASH}" +${VINCOIN_CLI_CALL} invalidateblock "${PIVOT_BLOCKHASH}" if [[ "${OUTPUT_PATH}" = "-" ]]; then (>&2 echo "Generating txoutset info...") - ${BITCOIN_CLI_CALL} gettxoutsetinfo | grep hash_serialized_3 | sed 's/^.*: "\(.\+\)\+",/\1/g' + ${VINCOIN_CLI_CALL} gettxoutsetinfo | grep hash_serialized_3 | sed 's/^.*: "\(.\+\)\+",/\1/g' else (>&2 echo "Generating UTXO snapshot...") - ${BITCOIN_CLI_CALL} dumptxoutset "${OUTPUT_PATH}" + ${VINCOIN_CLI_CALL} dumptxoutset "${OUTPUT_PATH}" fi diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index f70b94f8b337d..6688fcd5273f1 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -279,7 +279,7 @@ mkdir -p "$DISTSRC" # Make the os-specific installers case "$HOST" in *mingw*) - make deploy ${V:+V=1} BITCOIN_WIN_INSTALLER="${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe" + make deploy ${V:+V=1} VINCOIN_WIN_INSTALLER="${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe" ;; esac diff --git a/contrib/init/vincoind.conf b/contrib/init/vincoind.conf index 89f2fcb2dcbbb..6e3c99428130a 100644 --- a/contrib/init/vincoind.conf +++ b/contrib/init/vincoind.conf @@ -3,14 +3,14 @@ description "Vincoin Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] -env BITCOIND_BIN="/usr/bin/vincoind" -env BITCOIND_USER="vincoin" -env BITCOIND_GROUP="vincoin" -env BITCOIND_PIDDIR="/var/run/vincoind" +env VINCOIND_BIN="/usr/bin/vincoind" +env VINCOIND_USER="vincoin" +env VINCOIND_GROUP="vincoin" +env VINCOIND_PIDDIR="/var/run/vincoind" # upstart can't handle variables constructed with other variables -env BITCOIND_PIDFILE="/var/run/vincoind/vincoind.pid" -env BITCOIND_CONFIGFILE="/etc/vincoin/vincoin.conf" -env BITCOIND_DATADIR="/var/lib/vincoind" +env VINCOIND_PIDFILE="/var/run/vincoind/vincoind.pid" +env VINCOIND_CONFIGFILE="/etc/vincoin/vincoin.conf" +env VINCOIND_DATADIR="/var/lib/vincoind" expect fork @@ -24,9 +24,9 @@ pre-start script # long after forking, leaving upstart to think everything started fine. # since this is a commonly encountered case on install, just check and # warn here. - if ! grep -qs '^rpcpassword=' "$BITCOIND_CONFIGFILE" ; then + if ! grep -qs '^rpcpassword=' "$VINCOIND_CONFIGFILE" ; then echo "ERROR: You must set a secure rpcpassword to run vincoind." - echo "The setting must appear in $BITCOIND_CONFIGFILE" + echo "The setting must appear in $VINCOIND_CONFIGFILE" echo echo "This password is security critical to securing wallets " echo "and must not be the same as the rpcuser setting." @@ -44,22 +44,22 @@ pre-start script exit 1 fi - mkdir -p "$BITCOIND_PIDDIR" - chmod 0755 "$BITCOIND_PIDDIR" - chown $BITCOIND_USER:$BITCOIND_GROUP "$BITCOIND_PIDDIR" - chown $BITCOIND_USER:$BITCOIND_GROUP "$BITCOIND_CONFIGFILE" - chmod 0660 "$BITCOIND_CONFIGFILE" + mkdir -p "$VINCOIND_PIDDIR" + chmod 0755 "$VINCOIND_PIDDIR" + chown $VINCOIND_USER:$VINCOIND_GROUP "$VINCOIND_PIDDIR" + chown $VINCOIND_USER:$VINCOIND_GROUP "$VINCOIND_CONFIGFILE" + chmod 0660 "$VINCOIND_CONFIGFILE" end script exec start-stop-daemon \ --start \ - --pidfile "$BITCOIND_PIDFILE" \ - --chuid $BITCOIND_USER:$BITCOIND_GROUP \ - --exec "$BITCOIND_BIN" \ + --pidfile "$VINCOIND_PIDFILE" \ + --chuid $VINCOIND_USER:$VINCOIND_GROUP \ + --exec "$VINCOIND_BIN" \ -- \ - -pid="$BITCOIND_PIDFILE" \ - -conf="$BITCOIND_CONFIGFILE" \ - -datadir="$BITCOIND_DATADIR" \ + -pid="$VINCOIND_PIDFILE" \ + -conf="$VINCOIND_CONFIGFILE" \ + -datadir="$VINCOIND_DATADIR" \ -disablewallet \ -daemon diff --git a/contrib/init/vincoind.init b/contrib/init/vincoind.init index 1d1ee50e1acd1..a5bba8afa3002 100644 --- a/contrib/init/vincoind.init +++ b/contrib/init/vincoind.init @@ -19,14 +19,14 @@ fi RETVAL=0 prog=vincoind -# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/vincoind -lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/vincoind} +# you can override the lockfile via VINCOIND_LOCKFILE in /etc/sysconfig/vincoind +lockfile=${VINCOIND_LOCKFILE-/var/lock/subsys/vincoind} -# vincoind defaults to /usr/bin/vincoind, override with BITCOIND_BIN -vincoind=${BITCOIND_BIN-/usr/bin/vincoind} +# vincoind defaults to /usr/bin/vincoind, override with VINCOIND_BIN +vincoind=${VINCOIND_BIN-/usr/bin/vincoind} -# vincoind opts default to -disablewallet, override with BITCOIND_OPTS -vincoind_opts=${BITCOIND_OPTS--disablewallet} +# vincoind opts default to -disablewallet, override with VINCOIND_OPTS +vincoind_opts=${VINCOIND_OPTS--disablewallet} start() { echo -n $"Starting $prog: " diff --git a/contrib/init/vincoind.openrc b/contrib/init/vincoind.openrc index 411b86bdec263..19724176e1e15 100644 --- a/contrib/init/vincoind.openrc +++ b/contrib/init/vincoind.openrc @@ -3,40 +3,40 @@ # backward compatibility for existing gentoo layout # if [ -d "/var/lib/vincoin/.vincoin" ]; then - BITCOIND_DEFAULT_DATADIR="/var/lib/vincoin/.vincoin" + VINCOIND_DEFAULT_DATADIR="/var/lib/vincoin/.vincoin" else - BITCOIND_DEFAULT_DATADIR="/var/lib/vincoind" + VINCOIND_DEFAULT_DATADIR="/var/lib/vincoind" fi -BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/vincoin/vincoin.conf} -BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/vincoind} -BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/vincoind.pid} -BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} -BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-vincoin}} -BITCOIND_GROUP=${BITCOIND_GROUP:-vincoin} -BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/vincoind} -BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} -BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" +VINCOIND_CONFIGFILE=${VINCOIND_CONFIGFILE:-/etc/vincoin/vincoin.conf} +VINCOIND_PIDDIR=${VINCOIND_PIDDIR:-/var/run/vincoind} +VINCOIND_PIDFILE=${VINCOIND_PIDFILE:-${VINCOIND_PIDDIR}/vincoind.pid} +VINCOIND_DATADIR=${VINCOIND_DATADIR:-${VINCOIND_DEFAULT_DATADIR}} +VINCOIND_USER=${VINCOIND_USER:-${VINCOIN_USER:-vincoin}} +VINCOIND_GROUP=${VINCOIND_GROUP:-vincoin} +VINCOIND_BIN=${VINCOIND_BIN:-/usr/bin/vincoind} +VINCOIND_NICE=${VINCOIND_NICE:-${NICELEVEL:-0}} +VINCOIND_OPTS="${VINCOIND_OPTS:-${VINCOIN_OPTS}}" name="Vincoin Core Daemon" description="Vincoin cryptocurrency P2P network daemon" command="/usr/bin/vincoind" -command_args="-pid=\"${BITCOIND_PIDFILE}\" \ - -conf=\"${BITCOIND_CONFIGFILE}\" \ - -datadir=\"${BITCOIND_DATADIR}\" \ +command_args="-pid=\"${VINCOIND_PIDFILE}\" \ + -conf=\"${VINCOIND_CONFIGFILE}\" \ + -datadir=\"${VINCOIND_DATADIR}\" \ -daemon \ - ${BITCOIND_OPTS}" + ${VINCOIND_OPTS}" -required_files="${BITCOIND_CONFIGFILE}" -start_stop_daemon_args="-u ${BITCOIND_USER} \ - -N ${BITCOIND_NICE} -w 2000" -pidfile="${BITCOIND_PIDFILE}" +required_files="${VINCOIND_CONFIGFILE}" +start_stop_daemon_args="-u ${VINCOIND_USER} \ + -N ${VINCOIND_NICE} -w 2000" +pidfile="${VINCOIND_PIDFILE}" # The retry schedule to use when stopping the daemon. Could be either # a timeout in seconds or multiple signal/timeout pairs (like # "SIGKILL/180 SIGTERM/300") -retry="${BITCOIND_SIGTERM_TIMEOUT}" +retry="${VINCOIND_SIGTERM_TIMEOUT}" depend() { need localmount net @@ -50,30 +50,30 @@ start_pre() { checkpath \ -d \ --mode 0750 \ - --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ - "${BITCOIND_DATADIR}" + --owner "${VINCOIND_USER}:${VINCOIND_GROUP}" \ + "${VINCOIND_DATADIR}" checkpath \ -d \ --mode 0755 \ - --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ - "${BITCOIND_PIDDIR}" + --owner "${VINCOIND_USER}:${VINCOIND_GROUP}" \ + "${VINCOIND_PIDDIR}" checkpath -f \ - -o "${BITCOIND_USER}:${BITCOIND_GROUP}" \ + -o "${VINCOIND_USER}:${VINCOIND_GROUP}" \ -m 0660 \ - "${BITCOIND_CONFIGFILE}" + "${VINCOIND_CONFIGFILE}" checkconfig || return 1 } checkconfig() { - if grep -qs '^rpcuser=' "${BITCOIND_CONFIGFILE}" && \ - ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then + if grep -qs '^rpcuser=' "${VINCOIND_CONFIGFILE}" && \ + ! grep -qs '^rpcpassword=' "${VINCOIND_CONFIGFILE}" ; then eerror "" eerror "ERROR: You must set a secure rpcpassword to run vincoind." - eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" + eerror "The setting must appear in ${VINCOIND_CONFIGFILE}" eerror "" eerror "This password is security critical to securing wallets " eerror "and must not be the same as the rpcuser setting." diff --git a/contrib/init/vincoind.openrcconf b/contrib/init/vincoind.openrcconf index f4f44002fc0c1..cffeb5fadc2bb 100644 --- a/contrib/init/vincoind.openrcconf +++ b/contrib/init/vincoind.openrcconf @@ -1,33 +1,33 @@ # /etc/conf.d/vincoind: config file for /etc/init.d/vincoind # Config file location -#BITCOIND_CONFIGFILE="/etc/vincoin/vincoin.conf" +#VINCOIND_CONFIGFILE="/etc/vincoin/vincoin.conf" -# What directory to write pidfile to? (created and owned by $BITCOIND_USER) -#BITCOIND_PIDDIR="/var/run/vincoind" +# What directory to write pidfile to? (created and owned by $VINCOIND_USER) +#VINCOIND_PIDDIR="/var/run/vincoind" # What filename to give the pidfile -#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/vincoind.pid" +#VINCOIND_PIDFILE="${VINCOIND_PIDDIR}/vincoind.pid" # Where to write vincoind data (be mindful that the blockchain is large) -#BITCOIND_DATADIR="/var/lib/vincoind" +#VINCOIND_DATADIR="/var/lib/vincoind" # User and group to own vincoind process -#BITCOIND_USER="vincoin" -#BITCOIND_GROUP="vincoin" +#VINCOIND_USER="vincoin" +#VINCOIND_GROUP="vincoin" # Path to vincoind executable -#BITCOIND_BIN="/usr/bin/vincoind" +#VINCOIND_BIN="/usr/bin/vincoind" # Nice value to run vincoind under -#BITCOIND_NICE=0 +#VINCOIND_NICE=0 # Additional options (avoid -conf and -datadir, use flags above) -#BITCOIND_OPTS="" +#VINCOIND_OPTS="" # The timeout in seconds OpenRC will wait for vincoind to terminate # after a SIGTERM has been raised. # Note that this will be mapped as argument to start-stop-daemon's # '--retry' option, which means you can specify a retry schedule # here. For more information see man 8 start-stop-daemon. -BITCOIND_SIGTERM_TIMEOUT=600 +VINCOIND_SIGTERM_TIMEOUT=600 diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index 1990b1bea9f15..33c172600b1ea 100755 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -159,8 +159,8 @@ def main(): sys.exit(1) g = sys.stdout indir = sys.argv[1] - g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n') - g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\n') + g.write('#ifndef VINCOIN_CHAINPARAMSSEEDS_H\n') + g.write('#define VINCOIN_CHAINPARAMSSEEDS_H\n') g.write('/**\n') g.write(' * List of fixed seed nodes for the vincoin network\n') g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n') @@ -172,7 +172,7 @@ def main(): g.write('\n') with open(os.path.join(indir,'nodes_test.txt'), 'r', encoding="utf8") as f: process_nodes(g, f, 'chainparams_seed_test') - g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') + g.write('#endif // VINCOIN_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': main() diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index 100fe09685f98..9a39317e78dcc 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -810,17 +810,17 @@ 77mdte42srl42shdh2mhtjr7nf7dmedqrw6bkcdekhdvmnld6ojyyiad.onion:8333 azbpsh4arqlm6442wfimy7qr65bmha2zhgjg7wbaji6vvaug53hur2qd.onion:8333 b64xcbleqmwgq2u46bh4hegnlrzzvxntyzbmucn3zt7cssm7y4ubv3id.onion:8333 -bsqbtcparrfihlwolt4xgjbf4cgqckvrvsfyvy6vhiqrnh4w6ghixoid.onion:8333 -bsqbtctulf2g4jtjsdfgl2ed7qs6zz5wqx27qnyiik7laockryvszqqd.onion:8333 +bsqvncparrfihlwolt4xgjbf4cgqckvrvsfyvy6vhiqrnh4w6ghixoid.onion:8333 +bsqvnctulf2g4jtjsdfgl2ed7qs6zz5wqx27qnyiik7laockryvszqqd.onion:8333 cwi3ekrwhig47dhhzfenr5hbvckj7fzaojygvazi2lucsenwbzwoyiqd.onion:8333 -devinbtcmwkuitvxl3tfi5of4zau46ymeannkjv6fpnylkgf3q5fa3id.onion:8333 -devinbtctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion:8333 -devinbtcyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion:8333 +devinvncmwkuitvxl3tfi5of4zau46ymeannkjv6fpnylkgf3q5fa3id.onion:8333 +devinvnctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion:8333 +devinvncyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion:8333 dtql5vci4iaml4anmueftqr7bfgzqlauzfy4rc2tfgulldd3ekyijjyd.onion:8333 -emzybtc25oddoa2prol2znpz2axnrg6k77xwgirmhv7igoiucddsxiad.onion:8333 -emzybtc3ewh7zihpkdvuwlgxrhzcxy2p5fvjggp7ngjbxcytxvt4rjid.onion:8333 -emzybtc454ewbviqnmgtgx3rgublsgkk23r4onbhidcv36wremue4kqd.onion:8333 -emzybtc5bnpb2o6gh54oquiox54o4r7yn4a2wiiwzrjonlouaibm2zid.onion:8333 +emzyvnc25oddoa2prol2znpz2axnrg6k77xwgirmhv7igoiucddsxiad.onion:8333 +emzyvnc3ewh7zihpkdvuwlgxrhzcxy2p5fvjggp7ngjbxcytxvt4rjid.onion:8333 +emzyvnc454ewbviqnmgtgx3rgublsgkk23r4onbhidcv36wremue4kqd.onion:8333 +emzyvnc5bnpb2o6gh54oquiox54o4r7yn4a2wiiwzrjonlouaibm2zid.onion:8333 fpz6r5ppsakkwypjcglz6gcnwt7ytfhxskkfhzu62tnylcknh3eq6pad.onion:8333 hanvo3hzqbhcqm5vahhi5a3czxxdwc7vt56p5gr7bifcvelaqurv6iid.onion:8333 hz7oqntvj4adrwtqappcgaxfribg5u4rvfkpwlo3xup5fcuyvylkxlqd.onion:8333 diff --git a/contrib/seeds/nodes_main_manual.txt b/contrib/seeds/nodes_main_manual.txt index 91a64c6e51594..7de54c60241bb 100644 --- a/contrib/seeds/nodes_main_manual.txt +++ b/contrib/seeds/nodes_main_manual.txt @@ -9,17 +9,17 @@ 77mdte42srl42shdh2mhtjr7nf7dmedqrw6bkcdekhdvmnld6ojyyiad.onion:8333 azbpsh4arqlm6442wfimy7qr65bmha2zhgjg7wbaji6vvaug53hur2qd.onion:8333 b64xcbleqmwgq2u46bh4hegnlrzzvxntyzbmucn3zt7cssm7y4ubv3id.onion:8333 -bsqbtcparrfihlwolt4xgjbf4cgqckvrvsfyvy6vhiqrnh4w6ghixoid.onion:8333 -bsqbtctulf2g4jtjsdfgl2ed7qs6zz5wqx27qnyiik7laockryvszqqd.onion:8333 +bsqvncparrfihlwolt4xgjbf4cgqckvrvsfyvy6vhiqrnh4w6ghixoid.onion:8333 +bsqvnctulf2g4jtjsdfgl2ed7qs6zz5wqx27qnyiik7laockryvszqqd.onion:8333 cwi3ekrwhig47dhhzfenr5hbvckj7fzaojygvazi2lucsenwbzwoyiqd.onion:8333 -devinbtcmwkuitvxl3tfi5of4zau46ymeannkjv6fpnylkgf3q5fa3id.onion:8333 -devinbtctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion:8333 -devinbtcyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion:8333 +devinvncmwkuitvxl3tfi5of4zau46ymeannkjv6fpnylkgf3q5fa3id.onion:8333 +devinvnctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion:8333 +devinvncyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion:8333 dtql5vci4iaml4anmueftqr7bfgzqlauzfy4rc2tfgulldd3ekyijjyd.onion:8333 -emzybtc25oddoa2prol2znpz2axnrg6k77xwgirmhv7igoiucddsxiad.onion:8333 -emzybtc3ewh7zihpkdvuwlgxrhzcxy2p5fvjggp7ngjbxcytxvt4rjid.onion:8333 -emzybtc454ewbviqnmgtgx3rgublsgkk23r4onbhidcv36wremue4kqd.onion:8333 -emzybtc5bnpb2o6gh54oquiox54o4r7yn4a2wiiwzrjonlouaibm2zid.onion:8333 +emzyvnc25oddoa2prol2znpz2axnrg6k77xwgirmhv7igoiucddsxiad.onion:8333 +emzyvnc3ewh7zihpkdvuwlgxrhzcxy2p5fvjggp7ngjbxcytxvt4rjid.onion:8333 +emzyvnc454ewbviqnmgtgx3rgublsgkk23r4onbhidcv36wremue4kqd.onion:8333 +emzyvnc5bnpb2o6gh54oquiox54o4r7yn4a2wiiwzrjonlouaibm2zid.onion:8333 fpz6r5ppsakkwypjcglz6gcnwt7ytfhxskkfhzu62tnylcknh3eq6pad.onion:8333 hanvo3hzqbhcqm5vahhi5a3czxxdwc7vt56p5gr7bifcvelaqurv6iid.onion:8333 hz7oqntvj4adrwtqappcgaxfribg5u4rvfkpwlo3xup5fcuyvylkxlqd.onion:8333 diff --git a/contrib/verify-commits/README.md b/contrib/verify-commits/README.md index 020890c3660ee..2e399de5b2de2 100644 --- a/contrib/verify-commits/README.md +++ b/contrib/verify-commits/README.md @@ -57,5 +57,5 @@ file, individual commits which were signed by such a key can be added to the `allow-revsig-commits` file. That way, the PGP signatures are still verified but no new commits can be signed by any expired/revoked key. To easily build a list of commits which need to be added, verify-commits.py can be edited to test -each commit with BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG set to both 1 and 0, and +each commit with VINCOIN_VERIFY_COMMITS_ALLOW_REVSIG set to both 1 and 0, and those which need it set to 1 printed. diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh index c448efb586691..6b2e489846d85 100755 --- a/contrib/verify-commits/gpg.sh +++ b/contrib/verify-commits/gpg.sh @@ -5,7 +5,7 @@ export LC_ALL=C INPUT=$(cat /dev/stdin) -if [ "$BITCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then +if [ "$VINCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null exit $? else diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py index eee8a17e4b351..26fd0d9d1f270 100755 --- a/contrib/verify-commits/verify-commits.py +++ b/contrib/verify-commits/verify-commits.py @@ -135,7 +135,7 @@ def main(): no_sha1 = False - os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "0" if no_sha1 else "1" + os.environ['VINCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "0" if no_sha1 else "1" allow_revsig = current_commit in revsig_allowed # Check that the commit (and parents) was signed with a trusted key diff --git a/doc/developer-notes.md b/doc/developer-notes.md index d62a3bc138021..df6a50957196f 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -1153,13 +1153,13 @@ namespace { the location of the source file actually is relevant. - Use include guards to avoid the problem of double inclusion. The header file - `foo/bar.h` should use the include guard identifier `BITCOIN_FOO_BAR_H`, e.g. + `foo/bar.h` should use the include guard identifier `VINCOIN_FOO_BAR_H`, e.g. ```c++ -#ifndef BITCOIN_FOO_BAR_H -#define BITCOIN_FOO_BAR_H +#ifndef VINCOIN_FOO_BAR_H +#define VINCOIN_FOO_BAR_H ... -#endif // BITCOIN_FOO_BAR_H +#endif // VINCOIN_FOO_BAR_H ``` GUI diff --git a/doc/init.md b/doc/init.md index e4fd4d570e0ca..6f64a661fa87c 100644 --- a/doc/init.md +++ b/doc/init.md @@ -79,7 +79,7 @@ files out-of-the-box. This is because the command line options specified in the init files take precedence over the configurations in `/etc/vincoin/vincoin.conf`. However, some init systems have their own configuration mechanisms that would allow for overriding the command line -options specified in the init files (e.g. setting `BITCOIND_DATADIR` for +options specified in the init files (e.g. setting `VINCOIND_DATADIR` for OpenRC). ### macOS @@ -125,7 +125,7 @@ use old versions of Upstart and do not supply the start-stop-daemon utility. Copy vincoind.init to /etc/init.d/vincoind. Test by running `service vincoind start`. Using this script, you can adjust the path and flags to the vincoind program by -setting the BITCOIND and FLAGS environment variables in the file +setting the VINCOIND and FLAGS environment variables in the file /etc/sysconfig/vincoind. You can also use the DAEMONOPTS environment variable here. ### macOS diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 65f9cbb58f625..a8549417223ae 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,6 +1,6 @@ dist_man1_MANS= -if BUILD_BITCOIND +if BUILD_VINCOIND dist_man1_MANS+=vincoind.1 endif @@ -8,20 +8,20 @@ if ENABLE_QT dist_man1_MANS+=vincoin-qt.1 endif -if BUILD_BITCOIN_CLI +if BUILD_VINCOIN_CLI dist_man1_MANS+=vincoin-cli.1 endif -if BUILD_BITCOIN_TX +if BUILD_VINCOIN_TX dist_man1_MANS+=vincoin-tx.1 endif -if BUILD_BITCOIN_UTIL +if BUILD_VINCOIN_UTIL dist_man1_MANS+=vincoin-util.1 endif if ENABLE_WALLET -if BUILD_BITCOIN_WALLET +if BUILD_VINCOIN_WALLET dist_man1_MANS+=vincoin-wallet.1 endif endif diff --git a/doc/man/vincoin-cli.1 b/doc/man/vincoin-cli.1 index 37167df894182..f4182b4caf61b 100644 --- a/doc/man/vincoin-cli.1 +++ b/doc/man/vincoin-cli.1 @@ -1,4 +1,4 @@ -.TH BITCOIN-CLI "1" +.TH VINCOIN-CLI "1" .SH NAME vincoin-cli \- manual page for vincoin-cli diff --git a/doc/man/vincoin-qt.1 b/doc/man/vincoin-qt.1 index 3605b7b60bdd8..a65d3d31a70ce 100644 --- a/doc/man/vincoin-qt.1 +++ b/doc/man/vincoin-qt.1 @@ -1,4 +1,4 @@ -.TH BITCOIN-QT "1" +.TH VINCOIN-QT "1" .SH NAME vincoin-qt \- manual page for vincoin-qt diff --git a/doc/man/vincoin-tx.1 b/doc/man/vincoin-tx.1 index a58f35c42317d..d570d1eabb3c3 100644 --- a/doc/man/vincoin-tx.1 +++ b/doc/man/vincoin-tx.1 @@ -1,4 +1,4 @@ -.TH BITCOIN-TX "1" +.TH VINCOIN-TX "1" .SH NAME vincoin-tx \- manual page for vincoin-tx diff --git a/doc/man/vincoin-util.1 b/doc/man/vincoin-util.1 index 4e85c2f8f58f1..1dc8da9fc3e04 100644 --- a/doc/man/vincoin-util.1 +++ b/doc/man/vincoin-util.1 @@ -1,4 +1,4 @@ -.TH BITCOIN-UTIL "1" +.TH VINCOIN-UTIL "1" .SH NAME vincoin-util \- manual page for vincoin-util diff --git a/doc/man/vincoin-wallet.1 b/doc/man/vincoin-wallet.1 index 577925d7caa84..24a9506190bef 100644 --- a/doc/man/vincoin-wallet.1 +++ b/doc/man/vincoin-wallet.1 @@ -1,4 +1,4 @@ -.TH BITCOIN-WALLET "1" +.TH VINCOIN-WALLET "1" .SH NAME vincoin-wallet \- manual page for vincoin-wallet diff --git a/doc/man/vincoind.1 b/doc/man/vincoind.1 index fb2075ffef2b9..e7a763d40cbfa 100644 --- a/doc/man/vincoind.1 +++ b/doc/man/vincoind.1 @@ -1,4 +1,4 @@ -.TH BITCOIND "1" +.TH VINCOIND "1" .SH NAME vincoind \- manual page for vincoind diff --git a/doc/multiprocess.md b/doc/multiprocess.md index 801dba437690d..f5c70d18191b9 100644 --- a/doc/multiprocess.md +++ b/doc/multiprocess.md @@ -15,12 +15,12 @@ The `-debug=ipc` command line option can be used to see requests and responses b The multiprocess feature requires [Cap'n Proto](https://capnproto.org/) and [libmultiprocess](https://github.com/chaincodelabs/libmultiprocess) as dependencies. A simple way to get started using it without installing these dependencies manually is to use the [depends system](../depends) with the `MULTIPROCESS=1` [dependency option](../depends#dependency-options) passed to make: ``` -cd +cd make -C depends NO_QT=1 MULTIPROCESS=1 CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure make src/vincoin-node -regtest -printtoconsole -debug=ipc -BITCOIND=vincoin-node test/functional/test_runner.py +VINCOIND=vincoin-node test/functional/test_runner.py ``` The configure script will pick up settings and library locations from the depends directory, so there is no need to pass `--enable-multiprocess` as a separate flag when using the depends system (it's controlled by the `MULTIPROCESS=1` option). diff --git a/doc/psbt.md b/doc/psbt.md index e846af23e246a..28a2d5629861c 100644 --- a/doc/psbt.md +++ b/doc/psbt.md @@ -121,7 +121,7 @@ Setup: initiate transactions later, however. - They can now give out *Amulti* as address others can pay to. -Later, when *V* BTC has been received on *Amulti*, and Bob and Carol want to +Later, when *V* VNC has been received on *Amulti*, and Bob and Carol want to move the coins in their entirety to address *Asend*, with no change. Alice does not need to be involved. - One of them - let's assume Carol here - initiates the creation. She runs diff --git a/doc/tor.md b/doc/tor.md index 8d816d775b33e..69b002a0ccbf7 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -1,4 +1,4 @@ -# TOR SUPPORT IN BITCOIN +# TOR SUPPORT IN VINCOIN It is possible to run Vincoin Core as a Tor onion service, and connect to such services. diff --git a/share/genbuild.sh b/share/genbuild.sh index 3f6b098be3d09..423ce5c97a58a 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -20,7 +20,7 @@ fi GIT_TAG="" GIT_COMMIT="" -if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then +if [ "${VINCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then # clean 'dirty' status of touched files that haven't been modified git diff >/dev/null 2>/dev/null diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 15a91c02a55f4..c001a830bb753 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -26,7 +26,7 @@ Unicode true !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup !define MUI_STARTMENUPAGE_DEFAULTFOLDER "@PACKAGE_NAME@" !define MUI_FINISHPAGE_RUN "$WINDIR\explorer.exe" -!define MUI_FINISHPAGE_RUN_PARAMETERS $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ +!define MUI_FINISHPAGE_RUN_PARAMETERS $INSTDIR\@VINCOIN_GUI_NAME@@EXEEXT@ !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp" !define MUI_UNFINISHPAGE_NOAUTOCLOSE @@ -72,18 +72,18 @@ ShowUninstDetails show Section -Main SEC0000 SetOutPath $INSTDIR SetOverwrite on - File @abs_top_builddir@/release/@BITCOIN_GUI_NAME@@EXEEXT@ + File @abs_top_builddir@/release/@VINCOIN_GUI_NAME@@EXEEXT@ File /oname=COPYING.txt @abs_top_srcdir@/COPYING File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt File @abs_top_srcdir@/share/examples/vincoin.conf SetOutPath $INSTDIR\share\rpcauth File @abs_top_srcdir@/share/rpcauth/*.* SetOutPath $INSTDIR\daemon - File @abs_top_builddir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@ - File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@ - File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@ - File @abs_top_builddir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@ - File @abs_top_builddir@/release/@BITCOIN_TEST_NAME@@EXEEXT@ + File @abs_top_builddir@/release/@VINCOIN_DAEMON_NAME@@EXEEXT@ + File @abs_top_builddir@/release/@VINCOIN_CLI_NAME@@EXEEXT@ + File @abs_top_builddir@/release/@VINCOIN_TX_NAME@@EXEEXT@ + File @abs_top_builddir@/release/@VINCOIN_WALLET_TOOL_NAME@@EXEEXT@ + File @abs_top_builddir@/release/@VINCOIN_TEST_NAME@@EXEEXT@ SetOutPath $INSTDIR WriteRegStr HKCU "${REGKEY}\Components" Main 1 SectionEnd @@ -94,8 +94,8 @@ Section -post SEC0001 WriteUninstaller $INSTDIR\uninstall.exe !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory $SMPROGRAMS\$StartMenuGroup - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, 64-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1 + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@VINCOIN_GUI_NAME@@EXEEXT@ + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, 64-bit).lnk" "$INSTDIR\@VINCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@VINCOIN_GUI_NAME@@EXEEXT@" 1 CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe !insertmacro MUI_STARTMENU_WRITE_END WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" @@ -108,8 +108,8 @@ Section -post SEC0001 WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 WriteRegStr HKCR "@PACKAGE_TARNAME@" "URL Protocol" "" WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:Vincoin" - WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ - WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "%1"' + WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@VINCOIN_GUI_NAME@@EXEEXT@ + WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@VINCOIN_GUI_NAME@@EXEEXT@" "%1"' SectionEnd # Macro for selecting uninstaller sections @@ -127,7 +127,7 @@ done${UNSECTION_ID}: # Uninstaller sections Section /o -un.Main UNSEC0000 - Delete /REBOOTOK $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ + Delete /REBOOTOK $INSTDIR\@VINCOIN_GUI_NAME@@EXEEXT@ Delete /REBOOTOK $INSTDIR\COPYING.txt Delete /REBOOTOK $INSTDIR\readme.txt Delete /REBOOTOK $INSTDIR\vincoin.conf diff --git a/src/Makefile.am b/src/Makefile.am index e716280e3c821..caf0cd42c4854 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,53 +24,53 @@ check_PROGRAMS = TESTS = BENCHMARKS = -BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) - -LIBBITCOIN_NODE=libvincoin_node.a -LIBBITCOIN_COMMON=libvincoin_common.a -LIBBITCOIN_CONSENSUS=libvincoin_consensus.a -LIBBITCOIN_CLI=libvincoin_cli.a -LIBBITCOIN_UTIL=libvincoin_util.a -LIBBITCOIN_CRYPTO_BASE=crypto/libvincoin_crypto_base.la -LIBBITCOINQT=qt/libvincoinqt.a +VINCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) + +LIBVINCOIN_NODE=libvincoin_node.a +LIBVINCOIN_COMMON=libvincoin_common.a +LIBVINCOIN_CONSENSUS=libvincoin_consensus.a +LIBVINCOIN_CLI=libvincoin_cli.a +LIBVINCOIN_UTIL=libvincoin_util.a +LIBVINCOIN_CRYPTO_BASE=crypto/libvincoin_crypto_base.la +LIBVINCOINQT=qt/libvincoinqt.a LIBSECP256K1=secp256k1/libsecp256k1.la if ENABLE_ZMQ -LIBBITCOIN_ZMQ=libvincoin_zmq.a +LIBVINCOIN_ZMQ=libvincoin_zmq.a endif -if BUILD_BITCOIN_LIBS -LIBBITCOINCONSENSUS=libvincoinconsensus.la +if BUILD_VINCOIN_LIBS +LIBVINCOINCONSENSUS=libvincoinconsensus.la endif -if BUILD_BITCOIN_KERNEL_LIB -LIBBITCOINKERNEL=libvincoinkernel.la +if BUILD_VINCOIN_KERNEL_LIB +LIBVINCOINKERNEL=libvincoinkernel.la endif if ENABLE_WALLET -LIBBITCOIN_WALLET=libvincoin_wallet.a -LIBBITCOIN_WALLET_TOOL=libvincoin_wallet_tool.a +LIBVINCOIN_WALLET=libvincoin_wallet.a +LIBVINCOIN_WALLET_TOOL=libvincoin_wallet_tool.a endif -LIBBITCOIN_CRYPTO = $(LIBBITCOIN_CRYPTO_BASE) +LIBVINCOIN_CRYPTO = $(LIBVINCOIN_CRYPTO_BASE) if USE_ASM -LIBBITCOIN_CRYPTO_SSE4 = crypto/libvincoin_crypto_sse4.la -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE4) +LIBVINCOIN_CRYPTO_SSE4 = crypto/libvincoin_crypto_sse4.la +LIBVINCOIN_CRYPTO += $(LIBVINCOIN_CRYPTO_SSE4) endif if ENABLE_SSE41 -LIBBITCOIN_CRYPTO_SSE41 = crypto/libvincoin_crypto_sse41.la -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41) +LIBVINCOIN_CRYPTO_SSE41 = crypto/libvincoin_crypto_sse41.la +LIBVINCOIN_CRYPTO += $(LIBVINCOIN_CRYPTO_SSE41) endif if ENABLE_AVX2 -LIBBITCOIN_CRYPTO_AVX2 = crypto/libvincoin_crypto_avx2.la -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_AVX2) +LIBVINCOIN_CRYPTO_AVX2 = crypto/libvincoin_crypto_avx2.la +LIBVINCOIN_CRYPTO += $(LIBVINCOIN_CRYPTO_AVX2) endif if ENABLE_X86_SHANI -LIBBITCOIN_CRYPTO_X86_SHANI = crypto/libvincoin_crypto_x86_shani.la -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_X86_SHANI) +LIBVINCOIN_CRYPTO_X86_SHANI = crypto/libvincoin_crypto_x86_shani.la +LIBVINCOIN_CRYPTO += $(LIBVINCOIN_CRYPTO_X86_SHANI) endif if ENABLE_ARM_SHANI -LIBBITCOIN_CRYPTO_ARM_SHANI = crypto/libvincoin_crypto_arm_shani.la -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI) +LIBVINCOIN_CRYPTO_ARM_SHANI = crypto/libvincoin_crypto_arm_shani.la +LIBVINCOIN_CRYPTO += $(LIBVINCOIN_CRYPTO_ARM_SHANI) endif -noinst_LTLIBRARIES += $(LIBBITCOIN_CRYPTO) +noinst_LTLIBRARIES += $(LIBVINCOIN_CRYPTO) $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*) $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @@ -78,49 +78,49 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(w # Make is not made aware of per-object dependencies to avoid limiting building parallelization # But to build the less dependent modules first, we manually select their order here: EXTRA_LIBRARIES += \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_NODE) \ - $(LIBBITCOIN_CLI) \ - $(LIBBITCOIN_IPC) \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_WALLET_TOOL) \ - $(LIBBITCOIN_ZMQ) - -if BUILD_BITCOIND + $(LIBVINCOIN_UTIL) \ + $(LIBVINCOIN_COMMON) \ + $(LIBVINCOIN_CONSENSUS) \ + $(LIBVINCOIN_NODE) \ + $(LIBVINCOIN_CLI) \ + $(LIBVINCOIN_IPC) \ + $(LIBVINCOIN_WALLET) \ + $(LIBVINCOIN_WALLET_TOOL) \ + $(LIBVINCOIN_ZMQ) + +if BUILD_VINCOIND bin_PROGRAMS += vincoind endif -if BUILD_BITCOIN_NODE +if BUILD_VINCOIN_NODE bin_PROGRAMS += vincoin-node endif -if BUILD_BITCOIN_CLI +if BUILD_VINCOIN_CLI bin_PROGRAMS += vincoin-cli endif -if BUILD_BITCOIN_TX +if BUILD_VINCOIN_TX bin_PROGRAMS += vincoin-tx endif if ENABLE_WALLET -if BUILD_BITCOIN_WALLET +if BUILD_VINCOIN_WALLET bin_PROGRAMS += vincoin-wallet endif endif -if BUILD_BITCOIN_UTIL +if BUILD_VINCOIN_UTIL bin_PROGRAMS += vincoin-util endif -if BUILD_BITCOIN_CHAINSTATE +if BUILD_VINCOIN_CHAINSTATE bin_PROGRAMS += vincoin-chainstate endif .PHONY: FORCE check-symbols check-security # vincoin core # -BITCOIN_CORE_H = \ +VINCOIN_CORE_H = \ addresstype.h \ addrdb.h \ addrman.h \ @@ -380,7 +380,7 @@ obj/build.h: FORCE libvincoin_util_a-clientversion.$(OBJEXT): obj/build.h # node # -libvincoin_node_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(LEVELDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) +libvincoin_node_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(LEVELDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) libvincoin_node_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libvincoin_node_a_SOURCES = \ addrdb.cpp \ @@ -473,7 +473,7 @@ libvincoin_node_a_SOURCES = \ validation.cpp \ validationinterface.cpp \ versionbits.cpp \ - $(BITCOIN_CORE_H) + $(VINCOIN_CORE_H) if ENABLE_WALLET libvincoin_node_a_SOURCES += wallet/init.cpp @@ -486,7 +486,7 @@ endif # zmq # if ENABLE_ZMQ -libvincoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) +libvincoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(ZMQ_CFLAGS) libvincoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libvincoin_zmq_a_SOURCES = \ zmq/zmqabstractnotifier.cpp \ @@ -498,7 +498,7 @@ endif # # wallet # -libvincoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(BDB_CPPFLAGS) $(SQLITE_CFLAGS) +libvincoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(BDB_CPPFLAGS) $(SQLITE_CFLAGS) libvincoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libvincoin_wallet_a_SOURCES = \ wallet/coincontrol.cpp \ @@ -528,7 +528,7 @@ libvincoin_wallet_a_SOURCES = \ wallet/walletdb.cpp \ wallet/walletutil.cpp \ wallet/coinselection.cpp \ - $(BITCOIN_CORE_H) + $(VINCOIN_CORE_H) if USE_SQLITE libvincoin_wallet_a_SOURCES += wallet/sqlite.cpp @@ -539,11 +539,11 @@ endif # # wallet tool # -libvincoin_wallet_tool_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +libvincoin_wallet_tool_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(BOOST_CPPFLAGS) libvincoin_wallet_tool_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libvincoin_wallet_tool_a_SOURCES = \ wallet/wallettool.cpp \ - $(BITCOIN_CORE_H) + $(VINCOIN_CORE_H) # # crypto # @@ -636,7 +636,7 @@ crypto_libvincoin_crypto_arm_shani_la_SOURCES = crypto/sha256_arm_shani.cpp # # consensus # -libvincoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libvincoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) libvincoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libvincoin_consensus_a_SOURCES = \ arith_uint256.cpp \ @@ -673,7 +673,7 @@ libvincoin_consensus_a_SOURCES = \ # # common # -libvincoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +libvincoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(BOOST_CPPFLAGS) libvincoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libvincoin_common_a_SOURCES = \ addresstype.cpp \ @@ -720,7 +720,7 @@ libvincoin_common_a_SOURCES = \ script/signingprovider.cpp \ script/solver.cpp \ warnings.cpp \ - $(BITCOIN_CORE_H) + $(VINCOIN_CORE_H) if USE_LIBEVENT libvincoin_common_a_CPPFLAGS += $(EVENT_CFLAGS) @@ -729,7 +729,7 @@ endif # # util # -libvincoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libvincoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) libvincoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libvincoin_util_a_SOURCES = \ support/lockedpool.cpp \ @@ -769,24 +769,24 @@ libvincoin_util_a_SOURCES = \ util/string.cpp \ util/time.cpp \ util/tokenpipe.cpp \ - $(BITCOIN_CORE_H) + $(VINCOIN_CORE_H) # # cli # -libvincoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libvincoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) libvincoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libvincoin_cli_a_SOURCES = \ compat/stdin.h \ compat/stdin.cpp \ rpc/client.cpp \ - $(BITCOIN_CORE_H) + $(VINCOIN_CORE_H) nodist_libvincoin_util_a_SOURCES = $(srcdir)/obj/build.h # # vincoind & vincoin-node binaries # vincoin_daemon_sources = vincoind.cpp -vincoin_bin_cppflags = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +vincoin_bin_cppflags = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) vincoin_bin_cxxflags = $(AM_CXXFLAGS) $(PIE_FLAGS) vincoin_bin_ldflags = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) @@ -795,13 +795,13 @@ vincoin_daemon_sources += vincoind-res.rc endif vincoin_bin_ldadd = \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ + $(LIBVINCOIN_WALLET) \ + $(LIBVINCOIN_COMMON) \ + $(LIBVINCOIN_UTIL) \ $(LIBUNIVALUE) \ - $(LIBBITCOIN_ZMQ) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ + $(LIBVINCOIN_ZMQ) \ + $(LIBVINCOIN_CONSENSUS) \ + $(LIBVINCOIN_CRYPTO) \ $(LIBLEVELDB) \ $(LIBMEMENV) \ $(LIBSECP256K1) @@ -812,17 +812,17 @@ vincoind_SOURCES = $(vincoin_daemon_sources) init/vincoind.cpp vincoind_CPPFLAGS = $(vincoin_bin_cppflags) vincoind_CXXFLAGS = $(vincoin_bin_cxxflags) vincoind_LDFLAGS = $(vincoin_bin_ldflags) -vincoind_LDADD = $(LIBBITCOIN_NODE) $(vincoin_bin_ldadd) +vincoind_LDADD = $(LIBVINCOIN_NODE) $(vincoin_bin_ldadd) vincoin_node_SOURCES = $(vincoin_daemon_sources) init/vincoin-node.cpp vincoin_node_CPPFLAGS = $(vincoin_bin_cppflags) vincoin_node_CXXFLAGS = $(vincoin_bin_cxxflags) vincoin_node_LDFLAGS = $(vincoin_bin_ldflags) -vincoin_node_LDADD = $(LIBBITCOIN_NODE) $(vincoin_bin_ldadd) $(LIBBITCOIN_IPC) $(LIBMULTIPROCESS_LIBS) +vincoin_node_LDADD = $(LIBVINCOIN_NODE) $(vincoin_bin_ldadd) $(LIBVINCOIN_IPC) $(LIBMULTIPROCESS_LIBS) # vincoin-cli binary # vincoin_cli_SOURCES = vincoin-cli.cpp -vincoin_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) +vincoin_cli_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(EVENT_CFLAGS) vincoin_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) vincoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) @@ -831,18 +831,18 @@ vincoin_cli_SOURCES += vincoin-cli-res.rc endif vincoin_cli_LDADD = \ - $(LIBBITCOIN_CLI) \ + $(LIBVINCOIN_CLI) \ $(LIBUNIVALUE) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CRYPTO) + $(LIBVINCOIN_COMMON) \ + $(LIBVINCOIN_UTIL) \ + $(LIBVINCOIN_CRYPTO) vincoin_cli_LDADD += $(EVENT_LIBS) # # vincoin-tx binary # vincoin_tx_SOURCES = vincoin-tx.cpp -vincoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +vincoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) vincoin_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) vincoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) @@ -852,10 +852,10 @@ endif vincoin_tx_LDADD = \ $(LIBUNIVALUE) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ + $(LIBVINCOIN_COMMON) \ + $(LIBVINCOIN_UTIL) \ + $(LIBVINCOIN_CONSENSUS) \ + $(LIBVINCOIN_CRYPTO) \ $(LIBSECP256K1) # @@ -866,13 +866,13 @@ vincoin_wallet_CPPFLAGS = $(vincoin_bin_cppflags) vincoin_wallet_CXXFLAGS = $(vincoin_bin_cxxflags) vincoin_wallet_LDFLAGS = $(vincoin_bin_ldflags) vincoin_wallet_LDADD = \ - $(LIBBITCOIN_WALLET_TOOL) \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ + $(LIBVINCOIN_WALLET_TOOL) \ + $(LIBVINCOIN_WALLET) \ + $(LIBVINCOIN_COMMON) \ + $(LIBVINCOIN_UTIL) \ $(LIBUNIVALUE) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ + $(LIBVINCOIN_CONSENSUS) \ + $(LIBVINCOIN_CRYPTO) \ $(LIBSECP256K1) \ $(BDB_LIBS) \ $(SQLITE_LIBS) @@ -884,7 +884,7 @@ endif # vincoin-util binary # vincoin_util_SOURCES = vincoin-util.cpp -vincoin_util_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +vincoin_util_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) vincoin_util_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) vincoin_util_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) @@ -893,21 +893,21 @@ vincoin_util_SOURCES += vincoin-util-res.rc endif vincoin_util_LDADD = \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ + $(LIBVINCOIN_COMMON) \ + $(LIBVINCOIN_UTIL) \ $(LIBUNIVALUE) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ + $(LIBVINCOIN_CONSENSUS) \ + $(LIBVINCOIN_CRYPTO) \ $(LIBSECP256K1) # # vincoin-chainstate binary # vincoin_chainstate_SOURCES = vincoin-chainstate.cpp -vincoin_chainstate_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +vincoin_chainstate_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(BOOST_CPPFLAGS) vincoin_chainstate_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) vincoin_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(PTHREAD_FLAGS) $(LIBTOOL_APP_LDFLAGS) -static -vincoin_chainstate_LDADD = $(LIBBITCOINKERNEL) +vincoin_chainstate_LDADD = $(LIBVINCOINKERNEL) # libtool is unable to calculate this indirect dependency, presumably because it's a subproject. # libsecp256k1 only needs to be linked in when libvincoinkernel is static. @@ -915,11 +915,11 @@ vincoin_chainstate_LDADD += $(LIBSECP256K1) # # vincoinkernel library # -if BUILD_BITCOIN_KERNEL_LIB -lib_LTLIBRARIES += $(LIBBITCOINKERNEL) +if BUILD_VINCOIN_KERNEL_LIB +lib_LTLIBRARIES += $(LIBVINCOINKERNEL) libvincoinkernel_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) $(PTHREAD_FLAGS) -libvincoinkernel_la_LIBADD = $(LIBBITCOIN_CRYPTO) $(LIBLEVELDB) $(LIBMEMENV) $(LIBSECP256K1) +libvincoinkernel_la_LIBADD = $(LIBVINCOIN_CRYPTO) $(LIBLEVELDB) $(LIBMEMENV) $(LIBSECP256K1) libvincoinkernel_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) # libvincoinkernel requires default symbol visibility, explicitly specify that @@ -1015,19 +1015,19 @@ libvincoinkernel_la_SOURCES = \ # Required for obj/build.h to be generated first. # More details: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html libvincoinkernel_la-clientversion.l$(OBJEXT): obj/build.h -endif # BUILD_BITCOIN_KERNEL_LIB +endif # BUILD_VINCOIN_KERNEL_LIB # # vincoinconsensus library # -if BUILD_BITCOIN_LIBS -lib_LTLIBRARIES += $(LIBBITCOINCONSENSUS) +if BUILD_VINCOIN_LIBS +lib_LTLIBRARIES += $(LIBVINCOINCONSENSUS) include_HEADERS = script/vincoinconsensus.h libvincoinconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libvincoin_crypto_base_la_SOURCES) $(libvincoin_consensus_a_SOURCES) libvincoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) libvincoinconsensus_la_LIBADD = $(LIBSECP256K1) -libvincoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL -DDISABLE_OPTIMIZED_SHA256 +libvincoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_VINCOIN_INTERNAL -DDISABLE_OPTIMIZED_SHA256 libvincoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) endif @@ -1103,7 +1103,7 @@ EXTRA_DIST += $(libvincoin_ipc_mpgen_input) ipc/capnp/libvincoin_ipc_a-protocol.$(OBJEXT): $(libvincoin_ipc_mpgen_input:=.h) if BUILD_MULTIPROCESS -LIBBITCOIN_IPC=libvincoin_ipc.a +LIBVINCOIN_IPC=libvincoin_ipc.a libvincoin_ipc_a_SOURCES = \ ipc/capnp/common-types.h \ ipc/capnp/context.h \ @@ -1116,7 +1116,7 @@ libvincoin_ipc_a_SOURCES = \ ipc/process.cpp \ ipc/process.h \ ipc/protocol.h -libvincoin_ipc_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libvincoin_ipc_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) libvincoin_ipc_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(LIBMULTIPROCESS_CFLAGS) include $(MPGEN_PREFIX)/include/mpgen.mk diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index 194637f799620..8784fe33b0f21 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -58,17 +58,17 @@ bench_bench_vincoin_SOURCES = \ nodist_bench_bench_vincoin_SOURCES = $(GENERATED_BENCH_FILES) -bench_bench_vincoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ +bench_bench_vincoin_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ bench_bench_vincoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bench_bench_vincoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) bench_bench_vincoin_LDADD = \ $(LIBTEST_UTIL) \ - $(LIBBITCOIN_NODE) \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ + $(LIBVINCOIN_NODE) \ + $(LIBVINCOIN_WALLET) \ + $(LIBVINCOIN_COMMON) \ + $(LIBVINCOIN_UTIL) \ + $(LIBVINCOIN_CONSENSUS) \ + $(LIBVINCOIN_CRYPTO) \ $(LIBLEVELDB) \ $(LIBMEMENV) \ $(LIBSECP256K1) \ @@ -79,7 +79,7 @@ bench_bench_vincoin_LDADD = \ $(NATPMP_LIBS) if ENABLE_ZMQ -bench_bench_vincoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +bench_bench_vincoin_LDADD += $(LIBVINCOIN_ZMQ) $(ZMQ_LIBS) endif if ENABLE_WALLET @@ -93,9 +93,9 @@ bench_bench_vincoin_SOURCES += bench/wallet_ismine.cpp bench_bench_vincoin_LDADD += $(BDB_LIBS) $(SQLITE_LIBS) endif -CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_BENCH_FILES) +CLEAN_VINCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_BENCH_FILES) -CLEANFILES += $(CLEAN_BITCOIN_BENCH) +CLEANFILES += $(CLEAN_VINCOIN_BENCH) bench/data.cpp: bench/data/block413567.raw.h @@ -105,4 +105,4 @@ bench: $(BENCH_BINARY) FORCE $(BENCH_BINARY) vincoin_bench_clean : FORCE - rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_vincoin_OBJECTS) $(BENCH_BINARY) + rm -f $(CLEAN_VINCOIN_BENCH) $(bench_bench_vincoin_OBJECTS) $(BENCH_BINARY) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 948ddddcc8137..a3f7bfcbed1f7 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -4,7 +4,7 @@ bin_PROGRAMS += qt/vincoin-qt -if BUILD_BITCOIN_GUI +if BUILD_VINCOIN_GUI bin_PROGRAMS += vincoin-gui endif @@ -89,7 +89,7 @@ QT_MOC_CPP = \ qt/moc_walletmodel.cpp \ qt/moc_walletview.cpp -BITCOIN_MM = \ +VINCOIN_MM = \ qt/macdockiconhandler.mm \ qt/macnotificationhandler.mm \ qt/macos_appnap.mm @@ -105,7 +105,7 @@ QT_QRC = qt/vincoin.qrc QT_QRC_LOCALE_CPP = qt/qrc_vincoin_locale.cpp QT_QRC_LOCALE = qt/vincoin_locale.qrc -BITCOIN_QT_H = \ +VINCOIN_QT_H = \ qt/addressbookpage.h \ qt/addresstablemodel.h \ qt/askpassphrasedialog.h \ @@ -219,7 +219,7 @@ QT_RES_ICONS = \ qt/res/icons/tx_mined.png \ qt/res/icons/warning.png -BITCOIN_QT_BASE_CPP = \ +VINCOIN_QT_BASE_CPP = \ qt/bantablemodel.cpp \ qt/vincoin.cpp \ qt/vincoinaddressvalidator.cpp \ @@ -246,9 +246,9 @@ BITCOIN_QT_BASE_CPP = \ qt/trafficgraphwidget.cpp \ qt/utilitydialog.cpp -BITCOIN_QT_WINDOWS_CPP = qt/winshutdownmonitor.cpp +VINCOIN_QT_WINDOWS_CPP = qt/winshutdownmonitor.cpp -BITCOIN_QT_WALLET_CPP = \ +VINCOIN_QT_WALLET_CPP = \ qt/addressbookpage.cpp \ qt/addresstablemodel.cpp \ qt/askpassphrasedialog.cpp \ @@ -280,29 +280,29 @@ BITCOIN_QT_WALLET_CPP = \ qt/walletmodeltransaction.cpp \ qt/walletview.cpp -BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP) +VINCOIN_QT_CPP = $(VINCOIN_QT_BASE_CPP) if TARGET_WINDOWS -BITCOIN_QT_CPP += $(BITCOIN_QT_WINDOWS_CPP) +VINCOIN_QT_CPP += $(VINCOIN_QT_WINDOWS_CPP) endif if ENABLE_WALLET -BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP) +VINCOIN_QT_CPP += $(VINCOIN_QT_WALLET_CPP) endif # ENABLE_WALLET QT_RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png) -BITCOIN_QT_RC = qt/res/vincoin-qt-res.rc +VINCOIN_QT_RC = qt/res/vincoin-qt-res.rc -BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS -DQT_USE_QSTRINGBUILDER +VINCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS -DQT_USE_QSTRINGBUILDER -qt_libvincoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_libvincoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(VINCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(QR_CFLAGS) $(BOOST_CPPFLAGS) qt_libvincoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) qt_libvincoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS) -qt_libvincoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ +qt_libvincoinqt_a_SOURCES = $(VINCOIN_QT_CPP) $(VINCOIN_QT_H) $(QT_FORMS_UI) \ $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION) if TARGET_DARWIN - qt_libvincoinqt_a_SOURCES += $(BITCOIN_MM) + qt_libvincoinqt_a_SOURCES += $(VINCOIN_MM) endif nodist_qt_libvincoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP) @@ -316,22 +316,22 @@ $(QT_MOC): $(QT_FORMS_H) $(qt_libvincoinqt_a_OBJECTS) $(qt_vincoin_qt_OBJECTS) $(vincoin_gui_OBJECTS) : | $(QT_MOC) # vincoin-qt and vincoin-gui binaries # -vincoin_qt_cppflags = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +vincoin_qt_cppflags = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(VINCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QR_CFLAGS) vincoin_qt_cxxflags = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) vincoin_qt_sources = qt/main.cpp if TARGET_WINDOWS - vincoin_qt_sources += $(BITCOIN_QT_RC) + vincoin_qt_sources += $(VINCOIN_QT_RC) endif -vincoin_qt_ldadd = qt/libvincoinqt.a $(LIBBITCOIN_NODE) +vincoin_qt_ldadd = qt/libvincoinqt.a $(LIBVINCOIN_NODE) if ENABLE_WALLET -vincoin_qt_ldadd += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) +vincoin_qt_ldadd += $(LIBVINCOIN_UTIL) $(LIBVINCOIN_WALLET) endif if ENABLE_ZMQ -vincoin_qt_ldadd += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +vincoin_qt_ldadd += $(LIBVINCOIN_ZMQ) $(ZMQ_LIBS) endif -vincoin_qt_ldadd += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +vincoin_qt_ldadd += $(LIBVINCOIN_CLI) $(LIBVINCOIN_COMMON) $(LIBVINCOIN_UTIL) $(LIBVINCOIN_CONSENSUS) $(LIBVINCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(SQLITE_LIBS) vincoin_qt_ldflags = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) @@ -347,7 +347,7 @@ qt_vincoin_qt_LIBTOOLFLAGS = $(vincoin_qt_libtoolflags) vincoin_gui_CPPFLAGS = $(vincoin_qt_cppflags) vincoin_gui_CXXFLAGS = $(vincoin_qt_cxxflags) vincoin_gui_SOURCES = $(vincoin_qt_sources) init/vincoin-gui.cpp -vincoin_gui_LDADD = $(vincoin_qt_ldadd) $(LIBBITCOIN_IPC) $(LIBBITCOIN_UTIL) $(LIBMULTIPROCESS_LIBS) +vincoin_gui_LDADD = $(vincoin_qt_ldadd) $(LIBVINCOIN_IPC) $(LIBVINCOIN_UTIL) $(LIBMULTIPROCESS_LIBS) vincoin_gui_LDFLAGS = $(vincoin_qt_ldflags) vincoin_gui_LIBTOOLFLAGS = $(vincoin_qt_libtoolflags) @@ -361,11 +361,11 @@ $(srcdir)/qt/vincoinstrings.cpp: FORCE $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" $(PYTHON) ../share/qt/extract_strings_qt.py \ $(libvincoin_node_a_SOURCES) $(libvincoin_wallet_a_SOURCES) $(libvincoin_common_a_SOURCES) \ $(libvincoin_zmq_a_SOURCES) $(libvincoin_consensus_a_SOURCES) $(libvincoin_util_a_SOURCES) \ - $(BITCOIN_QT_BASE_CPP) $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) + $(VINCOIN_QT_BASE_CPP) $(VINCOIN_QT_WINDOWS_CPP) $(VINCOIN_QT_WALLET_CPP) $(VINCOIN_QT_H) $(VINCOIN_MM) # The resulted vincoin_en.xlf source file should follow Transifex requirements. # See: https://docs.transifex.com/formats/xliff#how-to-distinguish-between-a-source-file-and-a-translation-file -translate: $(srcdir)/qt/vincoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) +translate: $(srcdir)/qt/vincoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(VINCOIN_QT_BASE_CPP) $(VINCOIN_QT_WINDOWS_CPP) $(VINCOIN_QT_WALLET_CPP) $(VINCOIN_QT_H) $(VINCOIN_MM) @test -n $(LUPDATE) || echo "lupdate is required for updating translations" $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) -no-obsolete -I $(srcdir) -locations relative $^ -ts $(srcdir)/qt/locale/vincoin_en.ts @test -n $(LCONVERT) || echo "lconvert is required for updating translations" @@ -388,7 +388,7 @@ CLEAN_QT = $(nodist_qt_libvincoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda CLEANFILES += $(CLEAN_QT) vincoin_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libvincoinqt_a_OBJECTS) $(qt_vincoin_qt_OBJECTS) qt/vincoin-qt$(EXEEXT) $(LIBBITCOINQT) + rm -f $(CLEAN_QT) $(qt_libvincoinqt_a_OBJECTS) $(qt_vincoin_qt_OBJECTS) qt/vincoin-qt$(EXEEXT) $(LIBVINCOINQT) vincoin_qt : qt/vincoin-qt$(EXEEXT) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index e733348c2944e..d0c18f62023b2 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -26,7 +26,7 @@ TEST_QT_H = \ qt/test/util.h \ qt/test/wallettests.h -qt_test_test_vincoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_test_test_vincoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(VINCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(BOOST_CPPFLAGS) qt_test_test_vincoin_qt_SOURCES = \ @@ -47,23 +47,23 @@ endif # ENABLE_WALLET nodist_qt_test_test_vincoin_qt_SOURCES = $(TEST_QT_MOC_CPP) -qt_test_test_vincoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_NODE) $(LIBTEST_UTIL) +qt_test_test_vincoin_qt_LDADD = $(LIBVINCOINQT) $(LIBVINCOIN_NODE) $(LIBTEST_UTIL) if ENABLE_WALLET -qt_test_test_vincoin_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) +qt_test_test_vincoin_qt_LDADD += $(LIBVINCOIN_UTIL) $(LIBVINCOIN_WALLET) endif if ENABLE_ZMQ -qt_test_test_vincoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +qt_test_test_vincoin_qt_LDADD += $(LIBVINCOIN_ZMQ) $(ZMQ_LIBS) endif -qt_test_test_vincoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \ +qt_test_test_vincoin_qt_LDADD += $(LIBVINCOIN_CLI) $(LIBVINCOIN_COMMON) $(LIBVINCOIN_UTIL) $(LIBVINCOIN_CONSENSUS) $(LIBVINCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \ $(LIBMEMENV) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \ $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(SQLITE_LIBS) qt_test_test_vincoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) qt_test_test_vincoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno +CLEAN_VINCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno -CLEANFILES += $(CLEAN_BITCOIN_QT_TEST) +CLEANFILES += $(CLEAN_VINCOIN_QT_TEST) test_vincoin_qt : qt/test/test_vincoin-qt$(EXEEXT) @@ -71,4 +71,4 @@ test_vincoin_qt_check : qt/test/test_vincoin-qt$(EXEEXT) FORCE $(MAKE) check-TESTS TESTS=$^ test_vincoin_qt_clean: FORCE - rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_vincoin_qt_OBJECTS) + rm -f $(CLEAN_VINCOIN_QT_TEST) $(qt_test_test_vincoin_qt_OBJECTS) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 42b2d9afa74bb..ada80c527295a 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -31,20 +31,20 @@ RAW_TEST_FILES = \ GENERATED_TEST_FILES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h) -BITCOIN_TEST_SUITE = \ +VINCOIN_TEST_SUITE = \ test/main.cpp \ $(TEST_UTIL_H) FUZZ_SUITE_LD_COMMON = \ $(LIBTEST_UTIL) \ $(LIBTEST_FUZZ) \ - $(LIBBITCOIN_NODE) \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ - $(LIBBITCOIN_CLI) \ + $(LIBVINCOIN_NODE) \ + $(LIBVINCOIN_WALLET) \ + $(LIBVINCOIN_COMMON) \ + $(LIBVINCOIN_UTIL) \ + $(LIBVINCOIN_CONSENSUS) \ + $(LIBVINCOIN_CRYPTO) \ + $(LIBVINCOIN_CLI) \ $(LIBUNIVALUE) \ $(LIBLEVELDB) \ $(LIBMEMENV) \ @@ -62,7 +62,7 @@ FUZZ_SUITE_LD_COMMON += $(NATPMP_LIBS) endif # test_vincoin binary # -BITCOIN_TESTS =\ +VINCOIN_TESTS =\ test/addrman_tests.cpp \ test/allocator_tests.cpp \ test/amount_tests.cpp \ @@ -174,7 +174,7 @@ BITCOIN_TESTS =\ test/xoroshiro128plusplus_tests.cpp if ENABLE_WALLET -BITCOIN_TESTS += \ +VINCOIN_TESTS += \ wallet/test/feebumper_tests.cpp \ wallet/test/psbt_wallet_tests.cpp \ wallet/test/spend_tests.cpp \ @@ -195,7 +195,7 @@ FUZZ_SUITE_LD_COMMON +=\ $(BDB_LIBS) if USE_BDB -BITCOIN_TESTS += wallet/test/db_tests.cpp +VINCOIN_TESTS += wallet/test/db_tests.cpp endif FUZZ_WALLET_SRC = \ @@ -210,7 +210,7 @@ FUZZ_WALLET_SRC += \ wallet/test/fuzz/scriptpubkeyman.cpp endif # USE_SQLITE -BITCOIN_TEST_SUITE += \ +VINCOIN_TEST_SUITE += \ wallet/test/wallet_test_fixture.cpp \ wallet/test/wallet_test_fixture.h \ wallet/test/init_test_fixture.cpp \ @@ -218,17 +218,17 @@ BITCOIN_TEST_SUITE += \ endif # ENABLE_WALLET if BUILD_MULTIPROCESS -# Add boost ipc_tests definition to BITCOIN_TESTS -BITCOIN_TESTS += test/ipc_tests.cpp +# Add boost ipc_tests definition to VINCOIN_TESTS +VINCOIN_TESTS += test/ipc_tests.cpp # Build ipc_test code in a separate library so it can be compiled with custom # LIBMULTIPROCESS_CFLAGS without those flags affecting other tests -LIBBITCOIN_IPC_TEST=libvincoin_ipc_test.a -EXTRA_LIBRARIES += $(LIBBITCOIN_IPC_TEST) +LIBVINCOIN_IPC_TEST=libvincoin_ipc_test.a +EXTRA_LIBRARIES += $(LIBVINCOIN_IPC_TEST) libvincoin_ipc_test_a_SOURCES = \ test/ipc_test.cpp \ test/ipc_test.h -libvincoin_ipc_test_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libvincoin_ipc_test_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) libvincoin_ipc_test_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(LIBMULTIPROCESS_CFLAGS) # Generate various .c++/.h files from the ipc_test.capnp file @@ -250,18 +250,18 @@ endif # https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Recording-Dependencies-manually test/libvincoin_ipc_test_a-ipc_test.$(OBJEXT): test/ipc_test.capnp.h -test_test_vincoin_SOURCES = $(BITCOIN_TEST_SUITE) $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) -test_test_vincoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(TESTDEFS) $(BOOST_CPPFLAGS) $(EVENT_CFLAGS) +test_test_vincoin_SOURCES = $(VINCOIN_TEST_SUITE) $(VINCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) +test_test_vincoin_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(TESTDEFS) $(BOOST_CPPFLAGS) $(EVENT_CFLAGS) test_test_vincoin_LDADD = $(LIBTEST_UTIL) if ENABLE_WALLET -test_test_vincoin_LDADD += $(LIBBITCOIN_WALLET) +test_test_vincoin_LDADD += $(LIBVINCOIN_WALLET) test_test_vincoin_CPPFLAGS += $(BDB_CPPFLAGS) endif if BUILD_MULTIPROCESS -test_test_vincoin_LDADD += $(LIBBITCOIN_IPC_TEST) $(LIBMULTIPROCESS_LIBS) +test_test_vincoin_LDADD += $(LIBVINCOIN_IPC_TEST) $(LIBMULTIPROCESS_LIBS) endif -test_test_vincoin_LDADD += $(LIBBITCOIN_NODE) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \ +test_test_vincoin_LDADD += $(LIBVINCOIN_NODE) $(LIBVINCOIN_CLI) $(LIBVINCOIN_COMMON) $(LIBVINCOIN_UTIL) $(LIBVINCOIN_CONSENSUS) $(LIBVINCOIN_CRYPTO) $(LIBUNIVALUE) \ $(LIBLEVELDB) $(LIBMEMENV) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS) test_test_vincoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) @@ -269,12 +269,12 @@ test_test_vincoin_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE test_test_vincoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) -static if ENABLE_ZMQ -test_test_vincoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) -FUZZ_SUITE_LD_COMMON += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +test_test_vincoin_LDADD += $(LIBVINCOIN_ZMQ) $(ZMQ_LIBS) +FUZZ_SUITE_LD_COMMON += $(LIBVINCOIN_ZMQ) $(ZMQ_LIBS) endif if ENABLE_FUZZ_BINARY -test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(BOOST_CPPFLAGS) test_fuzz_fuzz_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_fuzz_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_fuzz_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) @@ -397,11 +397,11 @@ endif # ENABLE_FUZZ_BINARY nodist_test_test_vincoin_SOURCES = $(GENERATED_TEST_FILES) -$(BITCOIN_TESTS): $(GENERATED_TEST_FILES) +$(VINCOIN_TESTS): $(GENERATED_TEST_FILES) -CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno test/fuzz/*.gcda test/fuzz/*.gcno test/util/*.gcda test/util/*.gcno $(GENERATED_TEST_FILES) $(addsuffix .log,$(basename $(BITCOIN_TESTS))) +CLEAN_VINCOIN_TEST = test/*.gcda test/*.gcno test/fuzz/*.gcda test/fuzz/*.gcno test/util/*.gcda test/util/*.gcno $(GENERATED_TEST_FILES) $(addsuffix .log,$(basename $(VINCOIN_TESTS))) -CLEANFILES += $(CLEAN_BITCOIN_TEST) +CLEANFILES += $(CLEAN_VINCOIN_TEST) if TARGET_WINDOWS vincoin_test: $(TEST_BINARY) @@ -417,12 +417,12 @@ vincoin_test_check: $(TEST_BINARY) FORCE $(MAKE) check-TESTS TESTS=$^ vincoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_vincoin_OBJECTS) $(TEST_BINARY) + rm -f $(CLEAN_VINCOIN_TEST) $(test_test_vincoin_OBJECTS) $(TEST_BINARY) -check-unit: $(BITCOIN_TESTS:.cpp=.cpp.test) +check-unit: $(VINCOIN_TESTS:.cpp=.cpp.test) check-local: check-unit -if BUILD_BITCOIN_TX +if BUILD_VINCOIN_TX @echo "Running test/util/test_runner.py..." $(PYTHON) $(top_builddir)/test/util/test_runner.py endif diff --git a/src/Makefile.test_fuzz.include b/src/Makefile.test_fuzz.include index 5071ede851a2a..dbf5f6791b28b 100644 --- a/src/Makefile.test_fuzz.include +++ b/src/Makefile.test_fuzz.include @@ -15,7 +15,7 @@ TEST_FUZZ_H = \ test/fuzz/util/mempool.h \ test/fuzz/util/net.h -libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(BOOST_CPPFLAGS) libtest_fuzz_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libtest_fuzz_a_SOURCES = \ test/fuzz/fuzz.cpp \ diff --git a/src/Makefile.test_util.include b/src/Makefile.test_util.include index fa08c5cfb5fe1..2d101c775a950 100644 --- a/src/Makefile.test_util.include +++ b/src/Makefile.test_util.include @@ -30,7 +30,7 @@ if ENABLE_WALLET TEST_UTIL_H += wallet/test/util.h endif # ENABLE_WALLET -libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(VINCOIN_INCLUDES) $(BOOST_CPPFLAGS) libtest_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libtest_util_a_SOURCES = \ test/util/blockfilter.cpp \ diff --git a/src/addrdb.h b/src/addrdb.h index 0faff1fe9543c..8e4ec2bd4c607 100644 --- a/src/addrdb.h +++ b/src/addrdb.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_ADDRDB_H -#define BITCOIN_ADDRDB_H +#ifndef VINCOIN_ADDRDB_H +#define VINCOIN_ADDRDB_H #include #include @@ -67,4 +67,4 @@ void DumpAnchors(const fs::path& anchors_db_path, const std::vector& a */ std::vector ReadAnchors(const fs::path& anchors_db_path); -#endif // BITCOIN_ADDRDB_H +#endif // VINCOIN_ADDRDB_H diff --git a/src/addresstype.h b/src/addresstype.h index c1076d3d141ce..ef8d71e2de47a 100644 --- a/src/addresstype.h +++ b/src/addresstype.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_ADDRESSTYPE_H -#define BITCOIN_ADDRESSTYPE_H +#ifndef VINCOIN_ADDRESSTYPE_H +#define VINCOIN_ADDRESSTYPE_H #include #include @@ -152,4 +152,4 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) */ CScript GetScriptForDestination(const CTxDestination& dest); -#endif // BITCOIN_ADDRESSTYPE_H +#endif // VINCOIN_ADDRESSTYPE_H diff --git a/src/addrman.h b/src/addrman.h index 1ca852da960b1..3d6996ef2df35 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_ADDRMAN_H -#define BITCOIN_ADDRMAN_H +#ifndef VINCOIN_ADDRMAN_H +#define VINCOIN_ADDRMAN_H #include #include @@ -210,4 +210,4 @@ class AddrMan std::optional FindAddressEntry(const CAddress& addr); }; -#endif // BITCOIN_ADDRMAN_H +#endif // VINCOIN_ADDRMAN_H diff --git a/src/addrman_impl.h b/src/addrman_impl.h index b9a518efd8424..fb2fbb69a1aed 100644 --- a/src/addrman_impl.h +++ b/src/addrman_impl.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_ADDRMAN_IMPL_H -#define BITCOIN_ADDRMAN_IMPL_H +#ifndef VINCOIN_ADDRMAN_IMPL_H +#define VINCOIN_ADDRMAN_IMPL_H #include #include @@ -286,4 +286,4 @@ class AddrManImpl int CheckAddrman() const EXCLUSIVE_LOCKS_REQUIRED(cs); }; -#endif // BITCOIN_ADDRMAN_IMPL_H +#endif // VINCOIN_ADDRMAN_IMPL_H diff --git a/src/arith_uint256.h b/src/arith_uint256.h index 18b58b04b86d2..8046ee17378a7 100644 --- a/src/arith_uint256.h +++ b/src/arith_uint256.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_ARITH_UINT256_H -#define BITCOIN_ARITH_UINT256_H +#ifndef VINCOIN_ARITH_UINT256_H +#define VINCOIN_ARITH_UINT256_H #include #include @@ -276,4 +276,4 @@ arith_uint256 UintToArith256(const uint256 &); extern template class base_uint<256>; -#endif // BITCOIN_ARITH_UINT256_H +#endif // VINCOIN_ARITH_UINT256_H diff --git a/src/attributes.h b/src/attributes.h index 4246547c17b26..ba99d91ed3f07 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_ATTRIBUTES_H -#define BITCOIN_ATTRIBUTES_H +#ifndef VINCOIN_ATTRIBUTES_H +#define VINCOIN_ATTRIBUTES_H #if defined(__clang__) # if __has_attribute(lifetimebound) @@ -24,4 +24,4 @@ # error No known always_inline attribute for this platform. #endif -#endif // BITCOIN_ATTRIBUTES_H +#endif // VINCOIN_ATTRIBUTES_H diff --git a/src/banman.h b/src/banman.h index 1df07661e1af0..bafa779c9ec74 100644 --- a/src/banman.h +++ b/src/banman.h @@ -2,8 +2,8 @@ // Copyright (c) 2009-2022 The Vincoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_BANMAN_H -#define BITCOIN_BANMAN_H +#ifndef VINCOIN_BANMAN_H +#define VINCOIN_BANMAN_H #include #include @@ -93,4 +93,4 @@ class BanMan CRollingBloomFilter m_discouraged GUARDED_BY(m_banned_mutex) {50000, 0.000001}; }; -#endif // BITCOIN_BANMAN_H +#endif // VINCOIN_BANMAN_H diff --git a/src/base58.h b/src/base58.h index 6422a2ed5b54f..479f99ade2aee 100644 --- a/src/base58.h +++ b/src/base58.h @@ -11,8 +11,8 @@ * - E-mail usually won't line-break if there's no punctuation to break at. * - Double-clicking selects the whole string as one word if it's all alphanumeric. */ -#ifndef BITCOIN_BASE58_H -#define BITCOIN_BASE58_H +#ifndef VINCOIN_BASE58_H +#define VINCOIN_BASE58_H #include @@ -41,4 +41,4 @@ std::string EncodeBase58Check(Span input); */ [[nodiscard]] bool DecodeBase58Check(const std::string& str, std::vector& vchRet, int max_ret_len); -#endif // BITCOIN_BASE58_H +#endif // VINCOIN_BASE58_H diff --git a/src/bech32.h b/src/bech32.h index 488e503e26d64..0685b9a99b2bc 100644 --- a/src/bech32.h +++ b/src/bech32.h @@ -11,8 +11,8 @@ // // For more information, see BIP 173 and BIP 350. -#ifndef BITCOIN_BECH32_H -#define BITCOIN_BECH32_H +#ifndef VINCOIN_BECH32_H +#define VINCOIN_BECH32_H #include #include @@ -50,4 +50,4 @@ std::pair> LocateErrors(const std::string& str); } // namespace bech32 -#endif // BITCOIN_BECH32_H +#endif // VINCOIN_BECH32_H diff --git a/src/bench/bench.h b/src/bench/bench.h index 8b361d7758563..75ce601330f83 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_BENCH_BENCH_H -#define BITCOIN_BENCH_BENCH_H +#ifndef VINCOIN_BENCH_BENCH_H +#define VINCOIN_BENCH_BENCH_H #include #include @@ -79,4 +79,4 @@ class BenchRunner #define BENCHMARK(n, priority_level) \ benchmark::BenchRunner PASTE2(bench_, PASTE2(__LINE__, n))(STRINGIZE(n), n, priority_level); -#endif // BITCOIN_BENCH_BENCH_H +#endif // VINCOIN_BENCH_BENCH_H diff --git a/src/bench/data.h b/src/bench/data.h index ce33e1d120fcb..23bf658d0a031 100644 --- a/src/bench/data.h +++ b/src/bench/data.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_BENCH_DATA_H -#define BITCOIN_BENCH_DATA_H +#ifndef VINCOIN_BENCH_DATA_H +#define VINCOIN_BENCH_DATA_H #include #include @@ -16,4 +16,4 @@ extern const std::vector block413567; } // namespace data } // namespace benchmark -#endif // BITCOIN_BENCH_DATA_H +#endif // VINCOIN_BENCH_DATA_H diff --git a/src/bench/data/block413567.raw b/src/bench/data/block413567.raw index 67d2d5d38205e6ac9b281c742717ae720b228c9a..48f66ccf48733508b5bf19cfd728a7ac31754b36 100644 GIT binary patch delta 68 zcmX@#Ynum_of_internal_inputs; const auto& res = WITH_LOCK(wallet.cs_wallet, diff --git a/src/bip324.h b/src/bip324.h index 9f9f1d63cbc24..8f54a36d2c77e 100644 --- a/src/bip324.h +++ b/src/bip324.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_BIP324_H -#define BITCOIN_BIP324_H +#ifndef VINCOIN_BIP324_H +#define VINCOIN_BIP324_H #include #include @@ -93,4 +93,4 @@ class BIP324Cipher Span GetReceiveGarbageTerminator() const noexcept { return m_recv_garbage_terminator; } }; -#endif // BITCOIN_BIP324_H +#endif // VINCOIN_BIP324_H diff --git a/src/blockencodings.h b/src/blockencodings.h index 206576d068bf9..0d3cc72d5b92a 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_BLOCKENCODINGS_H -#define BITCOIN_BLOCKENCODINGS_H +#ifndef VINCOIN_BLOCKENCODINGS_H +#define VINCOIN_BLOCKENCODINGS_H #include @@ -147,4 +147,4 @@ class PartiallyDownloadedBlock { ReadStatus FillBlock(CBlock& block, const std::vector& vtx_missing); }; -#endif // BITCOIN_BLOCKENCODINGS_H +#endif // VINCOIN_BLOCKENCODINGS_H diff --git a/src/blockfilter.h b/src/blockfilter.h index 8d46515232b4c..b2223a182edc7 100644 --- a/src/blockfilter.h +++ b/src/blockfilter.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_BLOCKFILTER_H -#define BITCOIN_BLOCKFILTER_H +#ifndef VINCOIN_BLOCKFILTER_H +#define VINCOIN_BLOCKFILTER_H #include #include @@ -172,4 +172,4 @@ class BlockFilter } }; -#endif // BITCOIN_BLOCKFILTER_H +#endif // VINCOIN_BLOCKFILTER_H diff --git a/src/chain.h b/src/chain.h index c407c4b3aadad..85548fbce71a6 100644 --- a/src/chain.h +++ b/src/chain.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CHAIN_H -#define BITCOIN_CHAIN_H +#ifndef VINCOIN_CHAIN_H +#define VINCOIN_CHAIN_H #include #include @@ -513,4 +513,4 @@ CBlockLocator GetLocator(const CBlockIndex* index); /** Construct a list of hash entries to put in a locator. */ std::vector LocatorEntries(const CBlockIndex* index); -#endif // BITCOIN_CHAIN_H +#endif // VINCOIN_CHAIN_H diff --git a/src/chainparams.h b/src/chainparams.h index e7f67baa6540e..f5775a69ab9b6 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CHAINPARAMS_H -#define BITCOIN_CHAINPARAMS_H +#ifndef VINCOIN_CHAINPARAMS_H +#define VINCOIN_CHAINPARAMS_H #include // IWYU pragma: export @@ -28,4 +28,4 @@ const CChainParams &Params(); */ void SelectParams(const ChainType chain); -#endif // BITCOIN_CHAINPARAMS_H +#endif // VINCOIN_CHAINPARAMS_H diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 891d4078880ad..54cfe36e16f05 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CHAINPARAMSBASE_H -#define BITCOIN_CHAINPARAMSBASE_H +#ifndef VINCOIN_CHAINPARAMSBASE_H +#define VINCOIN_CHAINPARAMSBASE_H #include @@ -52,4 +52,4 @@ const CBaseChainParams& BaseParams(); /** Sets the params returned by Params() to those for the given chain. */ void SelectBaseParams(const ChainType chain); -#endif // BITCOIN_CHAINPARAMSBASE_H +#endif // VINCOIN_CHAINPARAMSBASE_H diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index fdde5f8975765..59a4ed6e51f3d 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -1,5 +1,5 @@ -#ifndef BITCOIN_CHAINPARAMSSEEDS_H -#define BITCOIN_CHAINPARAMSSEEDS_H +#ifndef VINCOIN_CHAINPARAMSSEEDS_H +#define VINCOIN_CHAINPARAMSSEEDS_H /** * List of fixed seed nodes for the vincoin network * AUTOGENERATED by contrib/seeds/generate-seeds.py @@ -10,4 +10,4 @@ static const uint8_t chainparams_seed_main[] = {0}; static const uint8_t chainparams_seed_test[] = {0}; -#endif // BITCOIN_CHAINPARAMSSEEDS_H +#endif // VINCOIN_CHAINPARAMSSEEDS_H diff --git a/src/checkqueue.h b/src/checkqueue.h index 2a8df47dacefe..0b5a2e04b0539 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CHECKQUEUE_H -#define BITCOIN_CHECKQUEUE_H +#ifndef VINCOIN_CHECKQUEUE_H +#define VINCOIN_CHECKQUEUE_H #include #include @@ -233,4 +233,4 @@ class CCheckQueueControl } }; -#endif // BITCOIN_CHECKQUEUE_H +#endif // VINCOIN_CHECKQUEUE_H diff --git a/src/clientversion.h b/src/clientversion.h index fce4a6a9c7532..c55357d8a32ff 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CLIENTVERSION_H -#define BITCOIN_CLIENTVERSION_H +#ifndef VINCOIN_CLIENTVERSION_H +#define VINCOIN_CLIENTVERSION_H #include @@ -48,4 +48,4 @@ std::string LicenseInfo(); #endif // WINDRES_PREPROC -#endif // BITCOIN_CLIENTVERSION_H +#endif // VINCOIN_CLIENTVERSION_H diff --git a/src/coins.h b/src/coins.h index 9cb643fea744c..bc11f25e81ef8 100644 --- a/src/coins.h +++ b/src/coins.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COINS_H -#define BITCOIN_COINS_H +#ifndef VINCOIN_COINS_H +#define VINCOIN_COINS_H #include #include @@ -390,4 +390,4 @@ class CCoinsViewErrorCatcher final : public CCoinsViewBacked }; -#endif // BITCOIN_COINS_H +#endif // VINCOIN_COINS_H diff --git a/src/common/args.cpp b/src/common/args.cpp index 08668c0f9daf0..6997c2ff9f8d7 100644 --- a/src/common/args.cpp +++ b/src/common/args.cpp @@ -35,8 +35,8 @@ #include #include -const char * const BITCOIN_CONF_FILENAME = "vincoin.conf"; -const char * const BITCOIN_SETTINGS_FILENAME = "settings.json"; +const char * const VINCOIN_CONF_FILENAME = "vincoin.conf"; +const char * const VINCOIN_SETTINGS_FILENAME = "settings.json"; ArgsManager gArgs; @@ -373,7 +373,7 @@ bool ArgsManager::IsArgSet(const std::string& strArg) const bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp, bool backup) const { - fs::path settings = GetPathArg("-settings", BITCOIN_SETTINGS_FILENAME); + fs::path settings = GetPathArg("-settings", VINCOIN_SETTINGS_FILENAME); if (settings.empty()) { return false; } diff --git a/src/common/args.h b/src/common/args.h index d951f739cb76e..897f062ac0bd6 100644 --- a/src/common/args.h +++ b/src/common/args.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMMON_ARGS_H -#define BITCOIN_COMMON_ARGS_H +#ifndef VINCOIN_COMMON_ARGS_H +#define VINCOIN_COMMON_ARGS_H #include #include @@ -23,8 +23,8 @@ class ArgsManager; -extern const char * const BITCOIN_CONF_FILENAME; -extern const char * const BITCOIN_SETTINGS_FILENAME; +extern const char * const VINCOIN_CONF_FILENAME; +extern const char * const VINCOIN_SETTINGS_FILENAME; // Return true if -datadir option points to a valid directory or is not specified. bool CheckDataDirOption(const ArgsManager& args); @@ -481,4 +481,4 @@ class WinCmdLineArgs #endif } // namespace common -#endif // BITCOIN_COMMON_ARGS_H +#endif // VINCOIN_COMMON_ARGS_H diff --git a/src/common/bloom.h b/src/common/bloom.h index fe4a8f8600c2c..2b2567db62584 100644 --- a/src/common/bloom.h +++ b/src/common/bloom.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMMON_BLOOM_H -#define BITCOIN_COMMON_BLOOM_H +#ifndef VINCOIN_COMMON_BLOOM_H +#define VINCOIN_COMMON_BLOOM_H #include #include @@ -124,4 +124,4 @@ class CRollingBloomFilter int nHashFuncs; }; -#endif // BITCOIN_COMMON_BLOOM_H +#endif // VINCOIN_COMMON_BLOOM_H diff --git a/src/common/config.cpp b/src/common/config.cpp index ec6ac72fdd3a8..9b4471493c078 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -121,7 +121,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys) LOCK(cs_args); m_settings.ro_config.clear(); m_config_sections.clear(); - m_config_path = AbsPathForConfigVal(*this, GetPathArg("-conf", BITCOIN_CONF_FILENAME), /*net_specific=*/false); + m_config_path = AbsPathForConfigVal(*this, GetPathArg("-conf", VINCOIN_CONF_FILENAME), /*net_specific=*/false); } const auto conf_path{GetConfigFilePath()}; diff --git a/src/common/init.cpp b/src/common/init.cpp index 3229dcf962580..fd152d87b0512 100644 --- a/src/common/init.cpp +++ b/src/common/init.cpp @@ -32,7 +32,7 @@ std::optional InitConfig(ArgsManager& args, SettingsAbortFn setting // parse error, and specifying a datadir= location containing another // vincoin.conf file just ignores the other file.) const fs::path orig_datadir_path{args.GetDataDirBase()}; - const fs::path orig_config_path{AbsPathForConfigVal(args, args.GetPathArg("-conf", BITCOIN_CONF_FILENAME), /*net_specific=*/false)}; + const fs::path orig_config_path{AbsPathForConfigVal(args, args.GetPathArg("-conf", VINCOIN_CONF_FILENAME), /*net_specific=*/false)}; std::string error; if (!args.ReadConfigFiles(error, true)) { @@ -64,7 +64,7 @@ std::optional InitConfig(ArgsManager& args, SettingsAbortFn setting // Show an error or warning if there is a vincoin.conf file in the // datadir that is being ignored. - const fs::path base_config_path = base_path / BITCOIN_CONF_FILENAME; + const fs::path base_config_path = base_path / VINCOIN_CONF_FILENAME; if (fs::exists(base_config_path) && !fs::equivalent(orig_config_path, base_config_path)) { const std::string cli_config_path = args.GetArg("-conf", ""); const std::string config_source = cli_config_path.empty() @@ -78,7 +78,7 @@ std::optional InitConfig(ArgsManager& args, SettingsAbortFn setting "includeconf= to include any other configuration files.\n" "- Set allowignoredconf=1 option to treat this condition as a warning, not an error.", fs::quoted(fs::PathToString(base_path)), - fs::quoted(BITCOIN_CONF_FILENAME), + fs::quoted(VINCOIN_CONF_FILENAME), fs::quoted(fs::PathToString(orig_config_path)), config_source); if (args.GetBoolArg("-allowignoredconf", false)) { diff --git a/src/common/init.h b/src/common/init.h index ee6f6d5f17617..eac7d2b674bab 100644 --- a/src/common/init.h +++ b/src/common/init.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMMON_INIT_H -#define BITCOIN_COMMON_INIT_H +#ifndef VINCOIN_COMMON_INIT_H +#define VINCOIN_COMMON_INIT_H #include @@ -36,4 +36,4 @@ using SettingsAbortFn = std::function InitConfig(ArgsManager& args, SettingsAbortFn settings_abort_fn = nullptr); } // namespace common -#endif // BITCOIN_COMMON_INIT_H +#endif // VINCOIN_COMMON_INIT_H diff --git a/src/common/run_command.h b/src/common/run_command.h index cb547308f33fd..b4c5dbc19b82f 100644 --- a/src/common/run_command.h +++ b/src/common/run_command.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMMON_RUN_COMMAND_H -#define BITCOIN_COMMON_RUN_COMMAND_H +#ifndef VINCOIN_COMMON_RUN_COMMAND_H +#define VINCOIN_COMMON_RUN_COMMAND_H #include @@ -18,4 +18,4 @@ class UniValue; */ UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in=""); -#endif // BITCOIN_COMMON_RUN_COMMAND_H +#endif // VINCOIN_COMMON_RUN_COMMAND_H diff --git a/src/common/settings.h b/src/common/settings.h index 673fd6dfb7535..2c66f90f6263f 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMMON_SETTINGS_H -#define BITCOIN_COMMON_SETTINGS_H +#ifndef VINCOIN_COMMON_SETTINGS_H +#define VINCOIN_COMMON_SETTINGS_H #include @@ -112,4 +112,4 @@ auto FindKey(Map&& map, Key&& key) -> decltype(&map.at(key)) } // namespace common -#endif // BITCOIN_COMMON_SETTINGS_H +#endif // VINCOIN_COMMON_SETTINGS_H diff --git a/src/common/system.h b/src/common/system.h index f4d812acfa488..4177b451654f6 100644 --- a/src/common/system.h +++ b/src/common/system.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMMON_SYSTEM_H -#define BITCOIN_COMMON_SYSTEM_H +#ifndef VINCOIN_COMMON_SYSTEM_H +#define VINCOIN_COMMON_SYSTEM_H #if defined(HAVE_CONFIG_H) #include @@ -31,4 +31,4 @@ void runCommand(const std::string& strCommand); */ int GetNumCores(); -#endif // BITCOIN_COMMON_SYSTEM_H +#endif // VINCOIN_COMMON_SYSTEM_H diff --git a/src/common/url.h b/src/common/url.h index 60cbfac774594..788ba895e34b1 100644 --- a/src/common/url.h +++ b/src/common/url.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMMON_URL_H -#define BITCOIN_COMMON_URL_H +#ifndef VINCOIN_COMMON_URL_H +#define VINCOIN_COMMON_URL_H #include @@ -11,4 +11,4 @@ using UrlDecodeFn = std::string(const std::string& url_encoded); UrlDecodeFn urlDecode; extern UrlDecodeFn* const URL_DECODE; -#endif // BITCOIN_COMMON_URL_H +#endif // VINCOIN_COMMON_URL_H diff --git a/src/compat/assumptions.h b/src/compat/assumptions.h index fd4d9e5e1a859..601047ac330a3 100644 --- a/src/compat/assumptions.h +++ b/src/compat/assumptions.h @@ -5,8 +5,8 @@ // Compile-time verification of assumptions we make. -#ifndef BITCOIN_COMPAT_ASSUMPTIONS_H -#define BITCOIN_COMPAT_ASSUMPTIONS_H +#ifndef VINCOIN_COMPAT_ASSUMPTIONS_H +#define VINCOIN_COMPAT_ASSUMPTIONS_H #include #include @@ -41,4 +41,4 @@ static_assert(sizeof(size_t) == sizeof(void*), "Sizes of size_t and void* assume // * We are NOT assuming a specific value for std::locale("").name(). // * We are NOT assuming a specific value for std::numeric_limits::is_signed. -#endif // BITCOIN_COMPAT_ASSUMPTIONS_H +#endif // VINCOIN_COMPAT_ASSUMPTIONS_H diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h index 2f74efd8222cb..16a709b02dd17 100644 --- a/src/compat/byteswap.h +++ b/src/compat/byteswap.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMPAT_BYTESWAP_H -#define BITCOIN_COMPAT_BYTESWAP_H +#ifndef VINCOIN_COMPAT_BYTESWAP_H +#define VINCOIN_COMPAT_BYTESWAP_H #if defined(HAVE_CONFIG_H) #include @@ -56,4 +56,4 @@ inline uint64_t bswap_64(uint64_t x) #endif // defined(MAC_OSX) -#endif // BITCOIN_COMPAT_BYTESWAP_H +#endif // VINCOIN_COMPAT_BYTESWAP_H diff --git a/src/compat/compat.h b/src/compat/compat.h index b92b6bdfa9260..cf1f4c6285534 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMPAT_COMPAT_H -#define BITCOIN_COMPAT_COMPAT_H +#ifndef VINCOIN_COMPAT_COMPAT_H +#define VINCOIN_COMPAT_COMPAT_H // Windows defines FD_SETSIZE to 64 (see _fd_types.h in mingw-w64), // which is too small for our usage, but allows us to redefine it safely. @@ -105,4 +105,4 @@ typedef char* sockopt_arg_type; #define MSG_DONTWAIT 0 #endif -#endif // BITCOIN_COMPAT_COMPAT_H +#endif // VINCOIN_COMPAT_COMPAT_H diff --git a/src/compat/cpuid.h b/src/compat/cpuid.h index 156f5c330a052..f440bd32bd335 100644 --- a/src/compat/cpuid.h +++ b/src/compat/cpuid.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMPAT_CPUID_H -#define BITCOIN_COMPAT_CPUID_H +#ifndef VINCOIN_COMPAT_CPUID_H +#define VINCOIN_COMPAT_CPUID_H #if defined(__x86_64__) || defined(__amd64__) || defined(__i386__) #define HAVE_GETCPUID @@ -23,4 +23,4 @@ void static inline GetCPUID(uint32_t leaf, uint32_t subleaf, uint32_t& a, uint32 } #endif // defined(__x86_64__) || defined(__amd64__) || defined(__i386__) -#endif // BITCOIN_COMPAT_CPUID_H +#endif // VINCOIN_COMPAT_CPUID_H diff --git a/src/compat/endian.h b/src/compat/endian.h index a2e94fbd41a28..ced0a882bd4ce 100644 --- a/src/compat/endian.h +++ b/src/compat/endian.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMPAT_ENDIAN_H -#define BITCOIN_COMPAT_ENDIAN_H +#ifndef VINCOIN_COMPAT_ENDIAN_H +#define VINCOIN_COMPAT_ENDIAN_H #if defined(HAVE_CONFIG_H) #include @@ -238,4 +238,4 @@ inline uint64_t le64toh(uint64_t little_endian_64bits) #endif // WORDS_BIGENDIAN -#endif // BITCOIN_COMPAT_ENDIAN_H +#endif // VINCOIN_COMPAT_ENDIAN_H diff --git a/src/compat/stdin.h b/src/compat/stdin.h index ecb730df77488..d5289d9935c08 100644 --- a/src/compat/stdin.h +++ b/src/compat/stdin.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMPAT_STDIN_H -#define BITCOIN_COMPAT_STDIN_H +#ifndef VINCOIN_COMPAT_STDIN_H +#define VINCOIN_COMPAT_STDIN_H struct NoechoInst { NoechoInst(); @@ -15,4 +15,4 @@ struct NoechoInst { bool StdinTerminal(); bool StdinReady(); -#endif // BITCOIN_COMPAT_STDIN_H +#endif // VINCOIN_COMPAT_STDIN_H diff --git a/src/compressor.h b/src/compressor.h index 0f8998d3a3606..f8c536f60f562 100644 --- a/src/compressor.h +++ b/src/compressor.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_COMPRESSOR_H -#define BITCOIN_COMPRESSOR_H +#ifndef VINCOIN_COMPRESSOR_H +#define VINCOIN_COMPRESSOR_H #include #include @@ -115,4 +115,4 @@ struct TxOutCompression FORMATTER_METHODS(CTxOut, obj) { READWRITE(Using(obj.nValue), Using(obj.scriptPubKey)); } }; -#endif // BITCOIN_COMPRESSOR_H +#endif // VINCOIN_COMPRESSOR_H diff --git a/src/consensus/amount.h b/src/consensus/amount.h index 2e1cb6ca6818c..e3091fb097a22 100644 --- a/src/consensus/amount.h +++ b/src/consensus/amount.h @@ -3,21 +3,21 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CONSENSUS_AMOUNT_H -#define BITCOIN_CONSENSUS_AMOUNT_H +#ifndef VINCOIN_CONSENSUS_AMOUNT_H +#define VINCOIN_CONSENSUS_AMOUNT_H #include /** Amount in satoshis (Can be negative) */ typedef int64_t CAmount; -/** The amount of satoshis in one BTC. */ +/** The amount of satoshis in one VNC. */ static constexpr CAmount COIN = 100000000; /** No amount larger than this (in satoshi) is valid. * * Note that this constant is *not* the total money supply, which in Vincoin - * currently happens to be less than 21,000,000 BTC for various reasons, but + * currently happens to be less than 21,000,000 VNC for various reasons, but * rather a sanity check. As this sanity check is used by consensus-critical * validation code, the exact value of the MAX_MONEY constant is consensus * critical; in unusual circumstances like a(nother) overflow bug that allowed @@ -26,4 +26,4 @@ static constexpr CAmount COIN = 100000000; static constexpr CAmount MAX_MONEY = 21000000 * COIN; inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } -#endif // BITCOIN_CONSENSUS_AMOUNT_H +#endif // VINCOIN_CONSENSUS_AMOUNT_H diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 266e4e088b2d7..818e9a08bb8ba 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CONSENSUS_CONSENSUS_H -#define BITCOIN_CONSENSUS_CONSENSUS_H +#ifndef VINCOIN_CONSENSUS_CONSENSUS_H +#define VINCOIN_CONSENSUS_CONSENSUS_H #include #include @@ -27,4 +27,4 @@ static const size_t MIN_SERIALIZABLE_TRANSACTION_WEIGHT = WITNESS_SCALE_FACTOR * /** Interpret sequence numbers as relative lock-time constraints. */ static constexpr unsigned int LOCKTIME_VERIFY_SEQUENCE = (1 << 0); -#endif // BITCOIN_CONSENSUS_CONSENSUS_H +#endif // VINCOIN_CONSENSUS_CONSENSUS_H diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index e8386a4581ce4..3f0a24511ebaa 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CONSENSUS_MERKLE_H -#define BITCOIN_CONSENSUS_MERKLE_H +#ifndef VINCOIN_CONSENSUS_MERKLE_H +#define VINCOIN_CONSENSUS_MERKLE_H #include @@ -24,4 +24,4 @@ uint256 BlockMerkleRoot(const CBlock& block, bool* mutated = nullptr); */ uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated = nullptr); -#endif // BITCOIN_CONSENSUS_MERKLE_H +#endif // VINCOIN_CONSENSUS_MERKLE_H diff --git a/src/consensus/params.h b/src/consensus/params.h index 69dcc872b1a71..89e32d21253a7 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CONSENSUS_PARAMS_H -#define BITCOIN_CONSENSUS_PARAMS_H +#ifndef VINCOIN_CONSENSUS_PARAMS_H +#define VINCOIN_CONSENSUS_PARAMS_H #include @@ -148,4 +148,4 @@ struct Params { } // namespace Consensus -#endif // BITCOIN_CONSENSUS_PARAMS_H +#endif // VINCOIN_CONSENSUS_PARAMS_H diff --git a/src/consensus/tx_check.h b/src/consensus/tx_check.h index f76837220b3cf..56fd27a4a240e 100644 --- a/src/consensus/tx_check.h +++ b/src/consensus/tx_check.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CONSENSUS_TX_CHECK_H -#define BITCOIN_CONSENSUS_TX_CHECK_H +#ifndef VINCOIN_CONSENSUS_TX_CHECK_H +#define VINCOIN_CONSENSUS_TX_CHECK_H /** * Context-independent transaction checking code that can be called outside the @@ -17,4 +17,4 @@ class TxValidationState; bool CheckTransaction(const CTransaction& tx, TxValidationState& state); -#endif // BITCOIN_CONSENSUS_TX_CHECK_H +#endif // VINCOIN_CONSENSUS_TX_CHECK_H diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h index 0a98279c83a6a..936cf9268637e 100644 --- a/src/consensus/tx_verify.h +++ b/src/consensus/tx_verify.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CONSENSUS_TX_VERIFY_H -#define BITCOIN_CONSENSUS_TX_VERIFY_H +#ifndef VINCOIN_CONSENSUS_TX_VERIFY_H +#define VINCOIN_CONSENSUS_TX_VERIFY_H #include @@ -75,4 +75,4 @@ bool EvaluateSequenceLocks(const CBlockIndex& block, std::pair loc */ bool SequenceLocks(const CTransaction &tx, int flags, std::vector& prevHeights, const CBlockIndex& block); -#endif // BITCOIN_CONSENSUS_TX_VERIFY_H +#endif // VINCOIN_CONSENSUS_TX_VERIFY_H diff --git a/src/consensus/validation.h b/src/consensus/validation.h index eebd29a0194bb..352e066610867 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CONSENSUS_VALIDATION_H -#define BITCOIN_CONSENSUS_VALIDATION_H +#ifndef VINCOIN_CONSENSUS_VALIDATION_H +#define VINCOIN_CONSENSUS_VALIDATION_H #include #include @@ -181,4 +181,4 @@ inline int GetWitnessCommitmentIndex(const CBlock& block) return commitpos; } -#endif // BITCOIN_CONSENSUS_VALIDATION_H +#endif // VINCOIN_CONSENSUS_VALIDATION_H diff --git a/src/core_io.h b/src/core_io.h index 24683981da3e5..d13f6ca29b108 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CORE_IO_H -#define BITCOIN_CORE_IO_H +#ifndef VINCOIN_CORE_IO_H +#define VINCOIN_CORE_IO_H #include #include @@ -56,4 +56,4 @@ std::string SighashToStr(unsigned char sighash_type); void ScriptToUniv(const CScript& script, UniValue& out, bool include_hex = true, bool include_address = false, const SigningProvider* provider = nullptr); void TxToUniv(const CTransaction& tx, const uint256& block_hash, UniValue& entry, bool include_hex = true, const CTxUndo* txundo = nullptr, TxVerbosity verbosity = TxVerbosity::SHOW_DETAILS); -#endif // BITCOIN_CORE_IO_H +#endif // VINCOIN_CORE_IO_H diff --git a/src/core_memusage.h b/src/core_memusage.h index 99119b366be84..25fad7d022a94 100644 --- a/src/core_memusage.h +++ b/src/core_memusage.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CORE_MEMUSAGE_H -#define BITCOIN_CORE_MEMUSAGE_H +#ifndef VINCOIN_CORE_MEMUSAGE_H +#define VINCOIN_CORE_MEMUSAGE_H #include #include @@ -68,4 +68,4 @@ static inline size_t RecursiveDynamicUsage(const std::shared_ptr& p) { return p ? memusage::DynamicUsage(p) + RecursiveDynamicUsage(*p) : 0; } -#endif // BITCOIN_CORE_MEMUSAGE_H +#endif // VINCOIN_CORE_MEMUSAGE_H diff --git a/src/crypto/aes.h b/src/crypto/aes.h index 1cacf5f32e4b2..e1ff00a035780 100644 --- a/src/crypto/aes.h +++ b/src/crypto/aes.h @@ -4,8 +4,8 @@ // // C++ wrapper around ctaes, a constant-time AES implementation -#ifndef BITCOIN_CRYPTO_AES_H -#define BITCOIN_CRYPTO_AES_H +#ifndef VINCOIN_CRYPTO_AES_H +#define VINCOIN_CRYPTO_AES_H extern "C" { #include @@ -64,4 +64,4 @@ class AES256CBCDecrypt unsigned char iv[AES_BLOCKSIZE]; }; -#endif // BITCOIN_CRYPTO_AES_H +#endif // VINCOIN_CRYPTO_AES_H diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h index d7f4e38fb5f80..43ca580d41b47 100644 --- a/src/crypto/chacha20.h +++ b/src/crypto/chacha20.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_CHACHA20_H -#define BITCOIN_CRYPTO_CHACHA20_H +#ifndef VINCOIN_CRYPTO_CHACHA20_H +#define VINCOIN_CRYPTO_CHACHA20_H #include @@ -156,4 +156,4 @@ class FSChaCha20 void Crypt(Span input, Span output) noexcept; }; -#endif // BITCOIN_CRYPTO_CHACHA20_H +#endif // VINCOIN_CRYPTO_CHACHA20_H diff --git a/src/crypto/chacha20poly1305.h b/src/crypto/chacha20poly1305.h index fec78a529fa41..ecaaef01be19c 100644 --- a/src/crypto/chacha20poly1305.h +++ b/src/crypto/chacha20poly1305.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_CHACHA20POLY1305_H -#define BITCOIN_CRYPTO_CHACHA20POLY1305_H +#ifndef VINCOIN_CRYPTO_CHACHA20POLY1305_H +#define VINCOIN_CRYPTO_CHACHA20POLY1305_H #include #include @@ -145,4 +145,4 @@ class FSChaCha20Poly1305 bool Decrypt(Span cipher, Span aad, Span plain1, Span plain2) noexcept; }; -#endif // BITCOIN_CRYPTO_CHACHA20POLY1305_H +#endif // VINCOIN_CRYPTO_CHACHA20POLY1305_H diff --git a/src/crypto/common.h b/src/crypto/common.h index 4d7a7bfe2e44e..4b9258c5c73b5 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_COMMON_H -#define BITCOIN_CRYPTO_COMMON_H +#ifndef VINCOIN_CRYPTO_COMMON_H +#define VINCOIN_CRYPTO_COMMON_H #if defined(HAVE_CONFIG_H) #include @@ -107,4 +107,4 @@ uint64_t static inline CountBits(uint64_t x) return ret; } -#endif // BITCOIN_CRYPTO_COMMON_H +#endif // VINCOIN_CRYPTO_COMMON_H diff --git a/src/crypto/hkdf_sha256_32.h b/src/crypto/hkdf_sha256_32.h index c3ad5a657dd29..124a8f442bc33 100644 --- a/src/crypto/hkdf_sha256_32.h +++ b/src/crypto/hkdf_sha256_32.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_HKDF_SHA256_32_H -#define BITCOIN_CRYPTO_HKDF_SHA256_32_H +#ifndef VINCOIN_CRYPTO_HKDF_SHA256_32_H +#define VINCOIN_CRYPTO_HKDF_SHA256_32_H #include @@ -22,4 +22,4 @@ class CHKDF_HMAC_SHA256_L32 void Expand32(const std::string& info, unsigned char hash[OUTPUT_SIZE]); }; -#endif // BITCOIN_CRYPTO_HKDF_SHA256_32_H +#endif // VINCOIN_CRYPTO_HKDF_SHA256_32_H diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h index 22d3e5677856b..3faab8319af74 100644 --- a/src/crypto/hmac_sha256.h +++ b/src/crypto/hmac_sha256.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_HMAC_SHA256_H -#define BITCOIN_CRYPTO_HMAC_SHA256_H +#ifndef VINCOIN_CRYPTO_HMAC_SHA256_H +#define VINCOIN_CRYPTO_HMAC_SHA256_H #include @@ -29,4 +29,4 @@ class CHMAC_SHA256 void Finalize(unsigned char hash[OUTPUT_SIZE]); }; -#endif // BITCOIN_CRYPTO_HMAC_SHA256_H +#endif // VINCOIN_CRYPTO_HMAC_SHA256_H diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h index c01a151dfc8e9..99e2850c85eb2 100644 --- a/src/crypto/hmac_sha512.h +++ b/src/crypto/hmac_sha512.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_HMAC_SHA512_H -#define BITCOIN_CRYPTO_HMAC_SHA512_H +#ifndef VINCOIN_CRYPTO_HMAC_SHA512_H +#define VINCOIN_CRYPTO_HMAC_SHA512_H #include @@ -29,4 +29,4 @@ class CHMAC_SHA512 void Finalize(unsigned char hash[OUTPUT_SIZE]); }; -#endif // BITCOIN_CRYPTO_HMAC_SHA512_H +#endif // VINCOIN_CRYPTO_HMAC_SHA512_H diff --git a/src/crypto/muhash.h b/src/crypto/muhash.h index 2256191b015f0..d13260c91e1fc 100644 --- a/src/crypto/muhash.h +++ b/src/crypto/muhash.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_MUHASH_H -#define BITCOIN_CRYPTO_MUHASH_H +#ifndef VINCOIN_CRYPTO_MUHASH_H +#define VINCOIN_CRYPTO_MUHASH_H #include #include @@ -124,4 +124,4 @@ class MuHash3072 } }; -#endif // BITCOIN_CRYPTO_MUHASH_H +#endif // VINCOIN_CRYPTO_MUHASH_H diff --git a/src/crypto/poly1305.h b/src/crypto/poly1305.h index 25a98601d49b4..65c82097f7d3f 100644 --- a/src/crypto/poly1305.h +++ b/src/crypto/poly1305.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_POLY1305_H -#define BITCOIN_CRYPTO_POLY1305_H +#ifndef VINCOIN_CRYPTO_POLY1305_H +#define VINCOIN_CRYPTO_POLY1305_H #include @@ -67,4 +67,4 @@ class Poly1305 } }; -#endif // BITCOIN_CRYPTO_POLY1305_H +#endif // VINCOIN_CRYPTO_POLY1305_H diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h index 23fa4820b4803..459a4e908d33e 100644 --- a/src/crypto/ripemd160.h +++ b/src/crypto/ripemd160.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_RIPEMD160_H -#define BITCOIN_CRYPTO_RIPEMD160_H +#ifndef VINCOIN_CRYPTO_RIPEMD160_H +#define VINCOIN_CRYPTO_RIPEMD160_H #include #include @@ -25,4 +25,4 @@ class CRIPEMD160 CRIPEMD160& Reset(); }; -#endif // BITCOIN_CRYPTO_RIPEMD160_H +#endif // VINCOIN_CRYPTO_RIPEMD160_H diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h index 1e78708c53253..272ed205866e9 100644 --- a/src/crypto/sha1.h +++ b/src/crypto/sha1.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_SHA1_H -#define BITCOIN_CRYPTO_SHA1_H +#ifndef VINCOIN_CRYPTO_SHA1_H +#define VINCOIN_CRYPTO_SHA1_H #include #include @@ -25,4 +25,4 @@ class CSHA1 CSHA1& Reset(); }; -#endif // BITCOIN_CRYPTO_SHA1_H +#endif // VINCOIN_CRYPTO_SHA1_H diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h index c293926d476f0..d1ee1580cd351 100644 --- a/src/crypto/sha256.h +++ b/src/crypto/sha256.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_SHA256_H -#define BITCOIN_CRYPTO_SHA256_H +#ifndef VINCOIN_CRYPTO_SHA256_H +#define VINCOIN_CRYPTO_SHA256_H #include #include @@ -50,4 +50,4 @@ std::string SHA256AutoDetect(sha256_implementation::UseImplementation use_implem */ void SHA256D64(unsigned char* output, const unsigned char* input, size_t blocks); -#endif // BITCOIN_CRYPTO_SHA256_H +#endif // VINCOIN_CRYPTO_SHA256_H diff --git a/src/crypto/sha3.h b/src/crypto/sha3.h index f2d1cfc7e8240..481375680eddf 100644 --- a/src/crypto/sha3.h +++ b/src/crypto/sha3.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_SHA3_H -#define BITCOIN_CRYPTO_SHA3_H +#ifndef VINCOIN_CRYPTO_SHA3_H +#define VINCOIN_CRYPTO_SHA3_H #include @@ -38,4 +38,4 @@ class SHA3_256 SHA3_256& Reset(); }; -#endif // BITCOIN_CRYPTO_SHA3_H +#endif // VINCOIN_CRYPTO_SHA3_H diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h index 71d53b16f6051..f97b86d7fa3c2 100644 --- a/src/crypto/sha512.h +++ b/src/crypto/sha512.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_SHA512_H -#define BITCOIN_CRYPTO_SHA512_H +#ifndef VINCOIN_CRYPTO_SHA512_H +#define VINCOIN_CRYPTO_SHA512_H #include #include @@ -26,4 +26,4 @@ class CSHA512 uint64_t Size() const { return bytes; } }; -#endif // BITCOIN_CRYPTO_SHA512_H +#endif // VINCOIN_CRYPTO_SHA512_H diff --git a/src/crypto/siphash.h b/src/crypto/siphash.h index 724e7b6487201..9b5fe2644e841 100644 --- a/src/crypto/siphash.h +++ b/src/crypto/siphash.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CRYPTO_SIPHASH_H -#define BITCOIN_CRYPTO_SIPHASH_H +#ifndef VINCOIN_CRYPTO_SIPHASH_H +#define VINCOIN_CRYPTO_SIPHASH_H #include @@ -45,4 +45,4 @@ class CSipHasher uint64_t SipHashUint256(uint64_t k0, uint64_t k1, const uint256& val); uint64_t SipHashUint256Extra(uint64_t k0, uint64_t k1, const uint256& val, uint32_t extra); -#endif // BITCOIN_CRYPTO_SIPHASH_H +#endif // VINCOIN_CRYPTO_SIPHASH_H diff --git a/src/cuckoocache.h b/src/cuckoocache.h index cb0b362143648..eec5fa574ca20 100644 --- a/src/cuckoocache.h +++ b/src/cuckoocache.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CUCKOOCACHE_H -#define BITCOIN_CUCKOOCACHE_H +#ifndef VINCOIN_CUCKOOCACHE_H +#define VINCOIN_CUCKOOCACHE_H #include @@ -487,4 +487,4 @@ class cache }; } // namespace CuckooCache -#endif // BITCOIN_CUCKOOCACHE_H +#endif // VINCOIN_CUCKOOCACHE_H diff --git a/src/dbwrapper.h b/src/dbwrapper.h index 71a7859f9a9f1..05b9d4459a7e3 100644 --- a/src/dbwrapper.h +++ b/src/dbwrapper.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_DBWRAPPER_H -#define BITCOIN_DBWRAPPER_H +#ifndef VINCOIN_DBWRAPPER_H +#define VINCOIN_DBWRAPPER_H #include #include @@ -294,4 +294,4 @@ class CDBWrapper } }; -#endif // BITCOIN_DBWRAPPER_H +#endif // VINCOIN_DBWRAPPER_H diff --git a/src/deploymentinfo.h b/src/deploymentinfo.h index 1e00fc1c8e265..208860ec5b12d 100644 --- a/src/deploymentinfo.h +++ b/src/deploymentinfo.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_DEPLOYMENTINFO_H -#define BITCOIN_DEPLOYMENTINFO_H +#ifndef VINCOIN_DEPLOYMENTINFO_H +#define VINCOIN_DEPLOYMENTINFO_H #include @@ -29,4 +29,4 @@ inline std::string DeploymentName(Consensus::DeploymentPos pos) std::optional GetBuriedDeployment(const std::string_view deployment_name); -#endif // BITCOIN_DEPLOYMENTINFO_H +#endif // VINCOIN_DEPLOYMENTINFO_H diff --git a/src/deploymentstatus.h b/src/deploymentstatus.h index 9b5bfb2c2c655..30a79aec1c3ed 100644 --- a/src/deploymentstatus.h +++ b/src/deploymentstatus.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_DEPLOYMENTSTATUS_H -#define BITCOIN_DEPLOYMENTSTATUS_H +#ifndef VINCOIN_DEPLOYMENTSTATUS_H +#define VINCOIN_DEPLOYMENTSTATUS_H #include #include @@ -49,4 +49,4 @@ inline bool DeploymentEnabled(const Consensus::Params& params, Consensus::Deploy return params.vDeployments[dep].nStartTime != Consensus::BIP9Deployment::NEVER_ACTIVE; } -#endif // BITCOIN_DEPLOYMENTSTATUS_H +#endif // VINCOIN_DEPLOYMENTSTATUS_H diff --git a/src/external_signer.h b/src/external_signer.h index ea2d3a6589360..4d86e70813812 100644 --- a/src/external_signer.h +++ b/src/external_signer.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_EXTERNAL_SIGNER_H -#define BITCOIN_EXTERNAL_SIGNER_H +#ifndef VINCOIN_EXTERNAL_SIGNER_H +#define VINCOIN_EXTERNAL_SIGNER_H #include #include @@ -63,4 +63,4 @@ class ExternalSigner bool SignTransaction(PartiallySignedTransaction& psbt, std::string& error); }; -#endif // BITCOIN_EXTERNAL_SIGNER_H +#endif // VINCOIN_EXTERNAL_SIGNER_H diff --git a/src/flatfile.h b/src/flatfile.h index 8e34ba3cd1732..28c6bdec495fb 100644 --- a/src/flatfile.h +++ b/src/flatfile.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_FLATFILE_H -#define BITCOIN_FLATFILE_H +#ifndef VINCOIN_FLATFILE_H +#define VINCOIN_FLATFILE_H #include @@ -86,4 +86,4 @@ class FlatFileSeq bool Flush(const FlatFilePos& pos, bool finalize = false); }; -#endif // BITCOIN_FLATFILE_H +#endif // VINCOIN_FLATFILE_H diff --git a/src/hash.h b/src/hash.h index 9711c7c245cf5..3b073f7630b93 100644 --- a/src/hash.h +++ b/src/hash.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_HASH_H -#define BITCOIN_HASH_H +#ifndef VINCOIN_HASH_H +#define VINCOIN_HASH_H #include #include @@ -226,4 +226,4 @@ inline uint160 RIPEMD160(Span data) return result; } -#endif // BITCOIN_HASH_H +#endif // VINCOIN_HASH_H diff --git a/src/headerssync.h b/src/headerssync.h index 051a1ef98879f..43f11988de00b 100644 --- a/src/headerssync.h +++ b/src/headerssync.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_HEADERSSYNC_H -#define BITCOIN_HEADERSSYNC_H +#ifndef VINCOIN_HEADERSSYNC_H +#define VINCOIN_HEADERSSYNC_H #include #include @@ -275,4 +275,4 @@ class HeadersSyncState { State m_download_state{State::PRESYNC}; }; -#endif // BITCOIN_HEADERSSYNC_H +#endif // VINCOIN_HEADERSSYNC_H diff --git a/src/httprpc.h b/src/httprpc.h index 2d9f63563ff12..68e403534ae67 100644 --- a/src/httprpc.h +++ b/src/httprpc.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_HTTPRPC_H -#define BITCOIN_HTTPRPC_H +#ifndef VINCOIN_HTTPRPC_H +#define VINCOIN_HTTPRPC_H #include @@ -31,4 +31,4 @@ void InterruptREST(); */ void StopREST(); -#endif // BITCOIN_HTTPRPC_H +#endif // VINCOIN_HTTPRPC_H diff --git a/src/httpserver.h b/src/httpserver.h index 95b504fa189fc..5a6bb7486eaee 100644 --- a/src/httpserver.h +++ b/src/httpserver.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_HTTPSERVER_H -#define BITCOIN_HTTPSERVER_H +#ifndef VINCOIN_HTTPSERVER_H +#define VINCOIN_HTTPSERVER_H #include #include @@ -177,4 +177,4 @@ class HTTPEvent struct event* ev; }; -#endif // BITCOIN_HTTPSERVER_H +#endif // VINCOIN_HTTPSERVER_H diff --git a/src/i2p.h b/src/i2p.h index c221c2e57350f..9e1065dddc70a 100644 --- a/src/i2p.h +++ b/src/i2p.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_I2P_H -#define BITCOIN_I2P_H +#ifndef VINCOIN_I2P_H +#define VINCOIN_I2P_H #include #include @@ -287,4 +287,4 @@ class Session } // namespace sam } // namespace i2p -#endif // BITCOIN_I2P_H +#endif // VINCOIN_I2P_H diff --git a/src/index/base.h b/src/index/base.h index fa8508da1df12..63d2fe2947826 100644 --- a/src/index/base.h +++ b/src/index/base.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INDEX_BASE_H -#define BITCOIN_INDEX_BASE_H +#ifndef VINCOIN_INDEX_BASE_H +#define VINCOIN_INDEX_BASE_H #include #include @@ -162,4 +162,4 @@ class BaseIndex : public CValidationInterface IndexSummary GetSummary() const; }; -#endif // BITCOIN_INDEX_BASE_H +#endif // VINCOIN_INDEX_BASE_H diff --git a/src/index/blockfilterindex.h b/src/index/blockfilterindex.h index 46ae237f72509..3d016d636ceb1 100644 --- a/src/index/blockfilterindex.h +++ b/src/index/blockfilterindex.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INDEX_BLOCKFILTERINDEX_H -#define BITCOIN_INDEX_BLOCKFILTERINDEX_H +#ifndef VINCOIN_INDEX_BLOCKFILTERINDEX_H +#define VINCOIN_INDEX_BLOCKFILTERINDEX_H #include #include @@ -103,4 +103,4 @@ bool DestroyBlockFilterIndex(BlockFilterType filter_type); /** Destroy all open block filter indexes. */ void DestroyAllBlockFilterIndexes(); -#endif // BITCOIN_INDEX_BLOCKFILTERINDEX_H +#endif // VINCOIN_INDEX_BLOCKFILTERINDEX_H diff --git a/src/index/coinstatsindex.h b/src/index/coinstatsindex.h index 8341eb278ec6a..533ed56c0e830 100644 --- a/src/index/coinstatsindex.h +++ b/src/index/coinstatsindex.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INDEX_COINSTATSINDEX_H -#define BITCOIN_INDEX_COINSTATSINDEX_H +#ifndef VINCOIN_INDEX_COINSTATSINDEX_H +#define VINCOIN_INDEX_COINSTATSINDEX_H #include #include @@ -64,4 +64,4 @@ class CoinStatsIndex final : public BaseIndex /// The global UTXO set hash object. extern std::unique_ptr g_coin_stats_index; -#endif // BITCOIN_INDEX_COINSTATSINDEX_H +#endif // VINCOIN_INDEX_COINSTATSINDEX_H diff --git a/src/index/disktxpos.h b/src/index/disktxpos.h index b137aabc9cc41..7d864d7d373bc 100644 --- a/src/index/disktxpos.h +++ b/src/index/disktxpos.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INDEX_DISKTXPOS_H -#define BITCOIN_INDEX_DISKTXPOS_H +#ifndef VINCOIN_INDEX_DISKTXPOS_H +#define VINCOIN_INDEX_DISKTXPOS_H #include #include @@ -23,4 +23,4 @@ struct CDiskTxPos : public FlatFilePos CDiskTxPos() {} }; -#endif // BITCOIN_INDEX_DISKTXPOS_H +#endif // VINCOIN_INDEX_DISKTXPOS_H diff --git a/src/index/txindex.h b/src/index/txindex.h index bd81d673e879d..3c3e4e1974df5 100644 --- a/src/index/txindex.h +++ b/src/index/txindex.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INDEX_TXINDEX_H -#define BITCOIN_INDEX_TXINDEX_H +#ifndef VINCOIN_INDEX_TXINDEX_H +#define VINCOIN_INDEX_TXINDEX_H #include @@ -48,4 +48,4 @@ class TxIndex final : public BaseIndex /// The global transaction index, used in GetTransaction. May be null. extern std::unique_ptr g_txindex; -#endif // BITCOIN_INDEX_TXINDEX_H +#endif // VINCOIN_INDEX_TXINDEX_H diff --git a/src/indirectmap.h b/src/indirectmap.h index caa5f8942dd01..9ef9cc7b073f9 100644 --- a/src/indirectmap.h +++ b/src/indirectmap.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INDIRECTMAP_H -#define BITCOIN_INDIRECTMAP_H +#ifndef VINCOIN_INDIRECTMAP_H +#define VINCOIN_INDIRECTMAP_H #include @@ -55,4 +55,4 @@ class indirectmap { const_iterator cend() const { return m.cend(); } }; -#endif // BITCOIN_INDIRECTMAP_H +#endif // VINCOIN_INDIRECTMAP_H diff --git a/src/init.cpp b/src/init.cpp index f51c32cbbb68d..1e89e44c12d15 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -153,7 +153,7 @@ static const char* DEFAULT_ASMAP_FILENAME="ip_asn.map"; /** * The PID file facilities. */ -static const char* BITCOIN_PID_FILENAME = "vincoind.pid"; +static const char* VINCOIN_PID_FILENAME = "vincoind.pid"; /** * True if this process has created a PID file. * Used to determine whether we should remove the PID file on shutdown. @@ -162,7 +162,7 @@ static bool g_generated_pid{false}; static fs::path GetPidFile(const ArgsManager& args) { - return AbsPathForConfigVal(args, args.GetPathArg("-pid", BITCOIN_PID_FILENAME)); + return AbsPathForConfigVal(args, args.GetPathArg("-pid", VINCOIN_PID_FILENAME)); } [[nodiscard]] static bool CreatePidFile(const ArgsManager& args) @@ -475,12 +475,12 @@ void SetupServerArgs(ArgsManager& argsman) argsman.AddArg("-blockreconstructionextratxn=", strprintf("Extra transactions to keep in memory for compact block reconstructions (default: %u)", DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-blocksonly", strprintf("Whether to reject transactions from network peers. Automatic broadcast and rebroadcast of any transactions from inbound peers is disabled, unless the peer has the 'forcerelay' permission. RPC transactions are not affected. (default: %u)", DEFAULT_BLOCKSONLY), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-coinstatsindex", strprintf("Maintain coinstats index used by the gettxoutsetinfo RPC (default: %u)", DEFAULT_COINSTATSINDEX), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); - argsman.AddArg("-conf=", strprintf("Specify path to read-only configuration file. Relative paths will be prefixed by datadir location (only useable from command line, not configuration file) (default: %s)", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-conf=", strprintf("Specify path to read-only configuration file. Relative paths will be prefixed by datadir location (only useable from command line, not configuration file) (default: %s)", VINCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-datadir=", "Specify data directory", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-dbbatchsize", strprintf("Maximum database write batch size in bytes (default: %u)", nDefaultDbBatchSize), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS); argsman.AddArg("-dbcache=", strprintf("Maximum database cache size MiB (%d to %d, default: %d). In addition, unused mempool memory is shared for this cache (see -maxmempool).", nMinDbCache, nMaxDbCache, nDefaultDbCache), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-includeconf=", "Specify additional configuration file, relative to the -datadir path (only useable from configuration file, not command line)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); - argsman.AddArg("-allowignoredconf", strprintf("For backwards compatibility, treat an unused %s file in the datadir as a warning, not an error.", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-allowignoredconf", strprintf("For backwards compatibility, treat an unused %s file in the datadir as a warning, not an error.", VINCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-loadblock=", "Imports blocks from external file on startup", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-maxmempool=", strprintf("Keep the transaction memory pool below megabytes (default: %u)", DEFAULT_MAX_MEMPOOL_SIZE_MB), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-maxorphantx=", strprintf("Keep at most unconnectable transactions in memory (default: %u)", DEFAULT_MAX_ORPHAN_TRANSACTIONS), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); @@ -494,13 +494,13 @@ void SetupServerArgs(ArgsManager& argsman) "(version 1) or the current format (version 2). This temporary option will be removed in the future. (default: %u)", DEFAULT_PERSIST_V1_DAT), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); - argsman.AddArg("-pid=", strprintf("Specify pid file. Relative paths will be prefixed by a net-specific datadir location. (default: %s)", BITCOIN_PID_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-pid=", strprintf("Specify pid file. Relative paths will be prefixed by a net-specific datadir location. (default: %s)", VINCOIN_PID_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-prune=", strprintf("Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex. " "Warning: Reverting this setting requires re-downloading the entire blockchain. " "(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >=%u = automatically prune block files to stay under the specified target size in MiB)", MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-reindex", "If enabled, wipe chain state and block index, and rebuild them from blk*.dat files on disk. Also wipe and rebuild other optional indexes that are active. If an assumeutxo snapshot was loaded, its chainstate will be wiped as well. The snapshot can then be reloaded via RPC.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-reindex-chainstate", "If enabled, wipe chain state, and rebuild it from blk*.dat files on disk. If an assumeutxo snapshot was loaded, its chainstate will be wiped as well. The snapshot can then be reloaded via RPC.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); - argsman.AddArg("-settings=", strprintf("Specify path to dynamic settings data file. Can be disabled with -nosettings. File is written at runtime and not meant to be edited by users (use %s instead for custom settings). Relative paths will be prefixed by datadir location. (default: %s)", BITCOIN_CONF_FILENAME, BITCOIN_SETTINGS_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-settings=", strprintf("Specify path to dynamic settings data file. Can be disabled with -nosettings. File is written at runtime and not meant to be edited by users (use %s instead for custom settings). Relative paths will be prefixed by datadir location. (default: %s)", VINCOIN_CONF_FILENAME, VINCOIN_SETTINGS_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); #if HAVE_SYSTEM argsman.AddArg("-startupnotify=", "Execute command on startup.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-shutdownnotify=", "Execute command immediately before beginning shutdown. The need for shutdown may be urgent, so be careful not to delay it long (if the command doesn't require interaction with the server, consider having it fork into the background).", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); diff --git a/src/init.h b/src/init.h index d26fde8db372e..60beee18251e5 100644 --- a/src/init.h +++ b/src/init.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INIT_H -#define BITCOIN_INIT_H +#ifndef VINCOIN_INIT_H +#define VINCOIN_INIT_H #include #include @@ -81,4 +81,4 @@ void SetupServerArgs(ArgsManager& argsman); /** Validates requirements to run the indexes and spawns each index initial sync thread */ bool StartIndexBackgroundSync(node::NodeContext& node); -#endif // BITCOIN_INIT_H +#endif // VINCOIN_INIT_H diff --git a/src/init/common.h b/src/init/common.h index f13597915b949..fd1277b89c7f2 100644 --- a/src/init/common.h +++ b/src/init/common.h @@ -5,8 +5,8 @@ //! @file //! @brief Common init functions shared by vincoin-node, vincoin-wallet, etc. -#ifndef BITCOIN_INIT_COMMON_H -#define BITCOIN_INIT_COMMON_H +#ifndef VINCOIN_INIT_COMMON_H +#define VINCOIN_INIT_COMMON_H #include @@ -21,4 +21,4 @@ bool StartLogging(const ArgsManager& args); void LogPackageVersion(); } // namespace init -#endif // BITCOIN_INIT_COMMON_H +#endif // VINCOIN_INIT_COMMON_H diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index 19a7289664f46..01870e3e5a36c 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACES_CHAIN_H -#define BITCOIN_INTERFACES_CHAIN_H +#ifndef VINCOIN_INTERFACES_CHAIN_H +#define VINCOIN_INTERFACES_CHAIN_H #include #include @@ -403,4 +403,4 @@ std::unique_ptr MakeChain(node::NodeContext& node); } // namespace interfaces -#endif // BITCOIN_INTERFACES_CHAIN_H +#endif // VINCOIN_INTERFACES_CHAIN_H diff --git a/src/interfaces/echo.h b/src/interfaces/echo.h index c45299194a80b..1ee96b50d8aca 100644 --- a/src/interfaces/echo.h +++ b/src/interfaces/echo.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACES_ECHO_H -#define BITCOIN_INTERFACES_ECHO_H +#ifndef VINCOIN_INTERFACES_ECHO_H +#define VINCOIN_INTERFACES_ECHO_H #include #include @@ -23,4 +23,4 @@ class Echo std::unique_ptr MakeEcho(); } // namespace interfaces -#endif // BITCOIN_INTERFACES_ECHO_H +#endif // VINCOIN_INTERFACES_ECHO_H diff --git a/src/interfaces/handler.h b/src/interfaces/handler.h index 6f14fe18d70eb..af681dddb8374 100644 --- a/src/interfaces/handler.h +++ b/src/interfaces/handler.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACES_HANDLER_H -#define BITCOIN_INTERFACES_HANDLER_H +#ifndef VINCOIN_INTERFACES_HANDLER_H +#define VINCOIN_INTERFACES_HANDLER_H #include #include @@ -36,4 +36,4 @@ std::unique_ptr MakeCleanupHandler(std::function cleanup); } // namespace interfaces -#endif // BITCOIN_INTERFACES_HANDLER_H +#endif // VINCOIN_INTERFACES_HANDLER_H diff --git a/src/interfaces/init.h b/src/interfaces/init.h index eb4875abc8ccd..509c2d4ba3ce5 100644 --- a/src/interfaces/init.h +++ b/src/interfaces/init.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACES_INIT_H -#define BITCOIN_INTERFACES_INIT_H +#ifndef VINCOIN_INTERFACES_INIT_H +#define VINCOIN_INTERFACES_INIT_H #include #include @@ -52,4 +52,4 @@ std::unique_ptr MakeWalletInit(int argc, char* argv[], int& exit_status); std::unique_ptr MakeGuiInit(int argc, char* argv[]); } // namespace interfaces -#endif // BITCOIN_INTERFACES_INIT_H +#endif // VINCOIN_INTERFACES_INIT_H diff --git a/src/interfaces/ipc.h b/src/interfaces/ipc.h index 206320f1a3834..de9f16a3ad82d 100644 --- a/src/interfaces/ipc.h +++ b/src/interfaces/ipc.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACES_IPC_H -#define BITCOIN_INTERFACES_IPC_H +#ifndef VINCOIN_INTERFACES_IPC_H +#define VINCOIN_INTERFACES_IPC_H #include #include @@ -75,4 +75,4 @@ class Ipc std::unique_ptr MakeIpc(const char* exe_name, const char* process_argv0, Init& init); } // namespace interfaces -#endif // BITCOIN_INTERFACES_IPC_H +#endif // VINCOIN_INTERFACES_IPC_H diff --git a/src/interfaces/node.h b/src/interfaces/node.h index 370f7f726b7b6..60b1f6347679e 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACES_NODE_H -#define BITCOIN_INTERFACES_NODE_H +#ifndef VINCOIN_INTERFACES_NODE_H +#define VINCOIN_INTERFACES_NODE_H #include #include // For CAmount @@ -281,4 +281,4 @@ struct BlockTip { } // namespace interfaces -#endif // BITCOIN_INTERFACES_NODE_H +#endif // VINCOIN_INTERFACES_NODE_H diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index 2a5e6c0a2a14e..de01ba6eb064f 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_INTERFACES_WALLET_H -#define BITCOIN_INTERFACES_WALLET_H +#ifndef VINCOIN_INTERFACES_WALLET_H +#define VINCOIN_INTERFACES_WALLET_H #include #include @@ -448,4 +448,4 @@ std::unique_ptr MakeWalletLoader(Chain& chain, ArgsManager& args); } // namespace interfaces -#endif // BITCOIN_INTERFACES_WALLET_H +#endif // VINCOIN_INTERFACES_WALLET_H diff --git a/src/ipc/capnp/common-types.h b/src/ipc/capnp/common-types.h index c6f090e41fa65..0bb03b49eb519 100644 --- a/src/ipc/capnp/common-types.h +++ b/src/ipc/capnp/common-types.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_IPC_CAPNP_COMMON_TYPES_H -#define BITCOIN_IPC_CAPNP_COMMON_TYPES_H +#ifndef VINCOIN_IPC_CAPNP_COMMON_TYPES_H +#define VINCOIN_IPC_CAPNP_COMMON_TYPES_H #include #include @@ -105,4 +105,4 @@ decltype(auto) CustomReadField(TypeList, Priority<1>, InvokeContext& i } } // namespace mp -#endif // BITCOIN_IPC_CAPNP_COMMON_TYPES_H +#endif // VINCOIN_IPC_CAPNP_COMMON_TYPES_H diff --git a/src/ipc/capnp/context.h b/src/ipc/capnp/context.h index e2d2e7dc0fa32..121747e8cd3d5 100644 --- a/src/ipc/capnp/context.h +++ b/src/ipc/capnp/context.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_IPC_CAPNP_CONTEXT_H -#define BITCOIN_IPC_CAPNP_CONTEXT_H +#ifndef VINCOIN_IPC_CAPNP_CONTEXT_H +#define VINCOIN_IPC_CAPNP_CONTEXT_H #include @@ -20,4 +20,4 @@ struct Context : ipc::Context } // namespace capnp } // namespace ipc -#endif // BITCOIN_IPC_CAPNP_CONTEXT_H +#endif // VINCOIN_IPC_CAPNP_CONTEXT_H diff --git a/src/ipc/capnp/init-types.h b/src/ipc/capnp/init-types.h index 4c915d022f104..e4810879e35fc 100644 --- a/src/ipc/capnp/init-types.h +++ b/src/ipc/capnp/init-types.h @@ -2,9 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_IPC_CAPNP_INIT_TYPES_H -#define BITCOIN_IPC_CAPNP_INIT_TYPES_H +#ifndef VINCOIN_IPC_CAPNP_INIT_TYPES_H +#define VINCOIN_IPC_CAPNP_INIT_TYPES_H #include -#endif // BITCOIN_IPC_CAPNP_INIT_TYPES_H +#endif // VINCOIN_IPC_CAPNP_INIT_TYPES_H diff --git a/src/ipc/capnp/protocol.h b/src/ipc/capnp/protocol.h index c07a497056434..6da8d4386e194 100644 --- a/src/ipc/capnp/protocol.h +++ b/src/ipc/capnp/protocol.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_IPC_CAPNP_PROTOCOL_H -#define BITCOIN_IPC_CAPNP_PROTOCOL_H +#ifndef VINCOIN_IPC_CAPNP_PROTOCOL_H +#define VINCOIN_IPC_CAPNP_PROTOCOL_H #include @@ -14,4 +14,4 @@ std::unique_ptr MakeCapnpProtocol(); } // namespace capnp } // namespace ipc -#endif // BITCOIN_IPC_CAPNP_PROTOCOL_H +#endif // VINCOIN_IPC_CAPNP_PROTOCOL_H diff --git a/src/ipc/context.h b/src/ipc/context.h index e2e59744fd9f1..5f13df213b092 100644 --- a/src/ipc/context.h +++ b/src/ipc/context.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_IPC_CONTEXT_H -#define BITCOIN_IPC_CONTEXT_H +#ifndef VINCOIN_IPC_CONTEXT_H +#define VINCOIN_IPC_CONTEXT_H namespace ipc { //! Context struct used to give IPC protocol implementations or implementation @@ -16,4 +16,4 @@ struct Context }; } // namespace ipc -#endif // BITCOIN_IPC_CONTEXT_H +#endif // VINCOIN_IPC_CONTEXT_H diff --git a/src/ipc/exception.h b/src/ipc/exception.h index 7f384031bd735..cfb8763924184 100644 --- a/src/ipc/exception.h +++ b/src/ipc/exception.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_IPC_EXCEPTION_H -#define BITCOIN_IPC_EXCEPTION_H +#ifndef VINCOIN_IPC_EXCEPTION_H +#define VINCOIN_IPC_EXCEPTION_H #include @@ -17,4 +17,4 @@ class Exception : public std::runtime_error }; } // namespace ipc -#endif // BITCOIN_IPC_EXCEPTION_H +#endif // VINCOIN_IPC_EXCEPTION_H diff --git a/src/ipc/process.h b/src/ipc/process.h index 2ca159a73ee92..c045bc96c1226 100644 --- a/src/ipc/process.h +++ b/src/ipc/process.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_IPC_PROCESS_H -#define BITCOIN_IPC_PROCESS_H +#ifndef VINCOIN_IPC_PROCESS_H +#define VINCOIN_IPC_PROCESS_H #include @@ -41,4 +41,4 @@ class Process std::unique_ptr MakeProcess(); } // namespace ipc -#endif // BITCOIN_IPC_PROCESS_H +#endif // VINCOIN_IPC_PROCESS_H diff --git a/src/ipc/protocol.h b/src/ipc/protocol.h index d6cee7694b524..f1b7741df7cdc 100644 --- a/src/ipc/protocol.h +++ b/src/ipc/protocol.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_IPC_PROTOCOL_H -#define BITCOIN_IPC_PROTOCOL_H +#ifndef VINCOIN_IPC_PROTOCOL_H +#define VINCOIN_IPC_PROTOCOL_H #include @@ -41,4 +41,4 @@ class Protocol }; } // namespace ipc -#endif // BITCOIN_IPC_PROTOCOL_H +#endif // VINCOIN_IPC_PROTOCOL_H diff --git a/src/kernel/blockmanager_opts.h b/src/kernel/blockmanager_opts.h index 2f9a5822d0fec..474f53151ece4 100644 --- a/src/kernel/blockmanager_opts.h +++ b/src/kernel/blockmanager_opts.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_BLOCKMANAGER_OPTS_H -#define BITCOIN_KERNEL_BLOCKMANAGER_OPTS_H +#ifndef VINCOIN_KERNEL_BLOCKMANAGER_OPTS_H +#define VINCOIN_KERNEL_BLOCKMANAGER_OPTS_H #include #include @@ -28,4 +28,4 @@ struct BlockManagerOpts { } // namespace kernel -#endif // BITCOIN_KERNEL_BLOCKMANAGER_OPTS_H +#endif // VINCOIN_KERNEL_BLOCKMANAGER_OPTS_H diff --git a/src/kernel/chain.h b/src/kernel/chain.h index fe23380b10f5d..1a3546f77ae2e 100644 --- a/src/kernel/chain.h +++ b/src/kernel/chain.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_CHAIN_H -#define BITCOIN_KERNEL_CHAIN_H +#ifndef VINCOIN_KERNEL_CHAIN_H +#define VINCOIN_KERNEL_CHAIN_H #include @@ -36,4 +36,4 @@ enum class ChainstateRole { std::ostream& operator<<(std::ostream& os, const ChainstateRole& role); -#endif // BITCOIN_KERNEL_CHAIN_H +#endif // VINCOIN_KERNEL_CHAIN_H diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index 1a590223e188c..13e04c25fc1ee 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -136,7 +136,7 @@ class CMainParams : public CChainParams { vSeeds.emplace_back("dnsseed.vincoin.dashjr.org."); // Luke Dashjr vSeeds.emplace_back("seed.vincoinstats.com."); // Christian Decker, supports x1 - xf vSeeds.emplace_back("seed.vincoin.jonasschnelli.ch."); // Jonas Schnelli, only supports x1, x5, x9, and xd - vSeeds.emplace_back("seed.btc.petertodd.net."); // Peter Todd, only supports x1, x5, x9, and xd + vSeeds.emplace_back("seed.vnc.petertodd.net."); // Peter Todd, only supports x1, x5, x9, and xd vSeeds.emplace_back("seed.vincoin.sprovoost.nl."); // Sjors Provoost vSeeds.emplace_back("dnsseed.emzy.de."); // Stephan Oeste vSeeds.emplace_back("seed.vincoin.wiz.biz."); // Jason Maurice @@ -243,7 +243,7 @@ class CTestNetParams : public CChainParams { vSeeds.clear(); // nodes with support for servicebits filtering should be at the top vSeeds.emplace_back("testnet-seed.vincoin.jonasschnelli.ch."); - vSeeds.emplace_back("seed.tbtc.petertodd.net."); + vSeeds.emplace_back("seed.tvnc.petertodd.net."); vSeeds.emplace_back("seed.testnet.vincoin.sprovoost.nl."); vSeeds.emplace_back("testnet-seed.bluematt.me."); // Just a static list of stable node(s), only supports x9 diff --git a/src/kernel/chainparams.h b/src/kernel/chainparams.h index e3def4eb77f29..46fc20735c1f2 100644 --- a/src/kernel/chainparams.h +++ b/src/kernel/chainparams.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_CHAINPARAMS_H -#define BITCOIN_KERNEL_CHAINPARAMS_H +#ifndef VINCOIN_KERNEL_CHAINPARAMS_H +#define VINCOIN_KERNEL_CHAINPARAMS_H #include #include @@ -183,4 +183,4 @@ class CChainParams ChainTxData chainTxData; }; -#endif // BITCOIN_KERNEL_CHAINPARAMS_H +#endif // VINCOIN_KERNEL_CHAINPARAMS_H diff --git a/src/kernel/chainstatemanager_opts.h b/src/kernel/chainstatemanager_opts.h index 03184088292bb..3f81c2fcfcaa5 100644 --- a/src/kernel/chainstatemanager_opts.h +++ b/src/kernel/chainstatemanager_opts.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_CHAINSTATEMANAGER_OPTS_H -#define BITCOIN_KERNEL_CHAINSTATEMANAGER_OPTS_H +#ifndef VINCOIN_KERNEL_CHAINSTATEMANAGER_OPTS_H +#define VINCOIN_KERNEL_CHAINSTATEMANAGER_OPTS_H #include @@ -50,4 +50,4 @@ struct ChainstateManagerOpts { } // namespace kernel -#endif // BITCOIN_KERNEL_CHAINSTATEMANAGER_OPTS_H +#endif // VINCOIN_KERNEL_CHAINSTATEMANAGER_OPTS_H diff --git a/src/kernel/checks.h b/src/kernel/checks.h index 0db34fc98223c..873492db275ff 100644 --- a/src/kernel/checks.h +++ b/src/kernel/checks.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_CHECKS_H -#define BITCOIN_KERNEL_CHECKS_H +#ifndef VINCOIN_KERNEL_CHECKS_H +#define VINCOIN_KERNEL_CHECKS_H #include @@ -17,4 +17,4 @@ struct Context; [[nodiscard]] util::Result SanityChecks(const Context&); } // namespace kernel -#endif // BITCOIN_KERNEL_CHECKS_H +#endif // VINCOIN_KERNEL_CHECKS_H diff --git a/src/kernel/coinstats.h b/src/kernel/coinstats.h index fa071ec764ac9..a734333579b80 100644 --- a/src/kernel/coinstats.h +++ b/src/kernel/coinstats.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_COINSTATS_H -#define BITCOIN_KERNEL_COINSTATS_H +#ifndef VINCOIN_KERNEL_COINSTATS_H +#define VINCOIN_KERNEL_COINSTATS_H #include #include @@ -79,4 +79,4 @@ void RemoveCoinHash(MuHash3072& muhash, const COutPoint& outpoint, const Coin& c std::optional ComputeUTXOStats(CoinStatsHashType hash_type, CCoinsView* view, node::BlockManager& blockman, const std::function& interruption_point = {}); } // namespace kernel -#endif // BITCOIN_KERNEL_COINSTATS_H +#endif // VINCOIN_KERNEL_COINSTATS_H diff --git a/src/kernel/context.h b/src/kernel/context.h index 9040652781208..fcedf0f5faed2 100644 --- a/src/kernel/context.h +++ b/src/kernel/context.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_CONTEXT_H -#define BITCOIN_KERNEL_CONTEXT_H +#ifndef VINCOIN_KERNEL_CONTEXT_H +#define VINCOIN_KERNEL_CONTEXT_H #include @@ -23,4 +23,4 @@ struct Context { }; } // namespace kernel -#endif // BITCOIN_KERNEL_CONTEXT_H +#endif // VINCOIN_KERNEL_CONTEXT_H diff --git a/src/kernel/cs_main.h b/src/kernel/cs_main.h index 7f62640590951..03a5b8841c1d2 100644 --- a/src/kernel/cs_main.h +++ b/src/kernel/cs_main.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_CS_MAIN_H -#define BITCOIN_KERNEL_CS_MAIN_H +#ifndef VINCOIN_KERNEL_CS_MAIN_H +#define VINCOIN_KERNEL_CS_MAIN_H #include @@ -19,4 +19,4 @@ */ extern RecursiveMutex cs_main; -#endif // BITCOIN_KERNEL_CS_MAIN_H +#endif // VINCOIN_KERNEL_CS_MAIN_H diff --git a/src/kernel/disconnected_transactions.h b/src/kernel/disconnected_transactions.h index 30e02e8ea0898..4a2fe98d4a1ee 100644 --- a/src/kernel/disconnected_transactions.h +++ b/src/kernel/disconnected_transactions.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_DISCONNECTED_TRANSACTIONS_H -#define BITCOIN_KERNEL_DISCONNECTED_TRANSACTIONS_H +#ifndef VINCOIN_KERNEL_DISCONNECTED_TRANSACTIONS_H +#define VINCOIN_KERNEL_DISCONNECTED_TRANSACTIONS_H #include #include @@ -73,4 +73,4 @@ class DisconnectedBlockTransactions { /** Clear all data structures and return the list of transactions. */ std::list take(); }; -#endif // BITCOIN_KERNEL_DISCONNECTED_TRANSACTIONS_H +#endif // VINCOIN_KERNEL_DISCONNECTED_TRANSACTIONS_H diff --git a/src/kernel/mempool_entry.h b/src/kernel/mempool_entry.h index 444e29ead672e..10f8be05da1b1 100644 --- a/src/kernel/mempool_entry.h +++ b/src/kernel/mempool_entry.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_MEMPOOL_ENTRY_H -#define BITCOIN_KERNEL_MEMPOOL_ENTRY_H +#ifndef VINCOIN_KERNEL_MEMPOOL_ENTRY_H +#define VINCOIN_KERNEL_MEMPOOL_ENTRY_H #include #include @@ -249,4 +249,4 @@ struct NewMempoolTransactionInfo { m_has_no_mempool_parents{has_no_mempool_parents} {} }; -#endif // BITCOIN_KERNEL_MEMPOOL_ENTRY_H +#endif // VINCOIN_KERNEL_MEMPOOL_ENTRY_H diff --git a/src/kernel/mempool_limits.h b/src/kernel/mempool_limits.h index 2691b1d5e4883..a22bd828dc58e 100644 --- a/src/kernel/mempool_limits.h +++ b/src/kernel/mempool_limits.h @@ -1,8 +1,8 @@ // Copyright (c) 2022 The Vincoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_MEMPOOL_LIMITS_H -#define BITCOIN_KERNEL_MEMPOOL_LIMITS_H +#ifndef VINCOIN_KERNEL_MEMPOOL_LIMITS_H +#define VINCOIN_KERNEL_MEMPOOL_LIMITS_H #include @@ -36,4 +36,4 @@ struct MemPoolLimits { }; } // namespace kernel -#endif // BITCOIN_KERNEL_MEMPOOL_LIMITS_H +#endif // VINCOIN_KERNEL_MEMPOOL_LIMITS_H diff --git a/src/kernel/mempool_options.h b/src/kernel/mempool_options.h index fecb329d9f936..57ae014610da3 100644 --- a/src/kernel/mempool_options.h +++ b/src/kernel/mempool_options.h @@ -1,8 +1,8 @@ // Copyright (c) 2022 The Vincoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_MEMPOOL_OPTIONS_H -#define BITCOIN_KERNEL_MEMPOOL_OPTIONS_H +#ifndef VINCOIN_KERNEL_MEMPOOL_OPTIONS_H +#define VINCOIN_KERNEL_MEMPOOL_OPTIONS_H #include @@ -59,4 +59,4 @@ struct MemPoolOptions { }; } // namespace kernel -#endif // BITCOIN_KERNEL_MEMPOOL_OPTIONS_H +#endif // VINCOIN_KERNEL_MEMPOOL_OPTIONS_H diff --git a/src/kernel/mempool_persist.h b/src/kernel/mempool_persist.h index a21a89142a63d..590062ab33bc6 100644 --- a/src/kernel/mempool_persist.h +++ b/src/kernel/mempool_persist.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_MEMPOOL_PERSIST_H -#define BITCOIN_KERNEL_MEMPOOL_PERSIST_H +#ifndef VINCOIN_KERNEL_MEMPOOL_PERSIST_H +#define VINCOIN_KERNEL_MEMPOOL_PERSIST_H #include @@ -31,4 +31,4 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, } // namespace kernel -#endif // BITCOIN_KERNEL_MEMPOOL_PERSIST_H +#endif // VINCOIN_KERNEL_MEMPOOL_PERSIST_H diff --git a/src/kernel/mempool_removal_reason.h b/src/kernel/mempool_removal_reason.h index 281dfd94605d3..53a4b566f441a 100644 --- a/src/kernel/mempool_removal_reason.h +++ b/src/kernel/mempool_removal_reason.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://opensource.org/license/mit/. -#ifndef BITCOIN_KERNEL_MEMPOOL_REMOVAL_REASON_H -#define BITCOIN_KERNEL_MEMPOOL_REMOVAL_REASON_H +#ifndef VINCOIN_KERNEL_MEMPOOL_REMOVAL_REASON_H +#define VINCOIN_KERNEL_MEMPOOL_REMOVAL_REASON_H #include @@ -21,4 +21,4 @@ enum class MemPoolRemovalReason { std::string RemovalReasonToString(const MemPoolRemovalReason& r) noexcept; -#endif // BITCOIN_KERNEL_MEMPOOL_REMOVAL_REASON_H +#endif // VINCOIN_KERNEL_MEMPOOL_REMOVAL_REASON_H diff --git a/src/kernel/messagestartchars.h b/src/kernel/messagestartchars.h index 673b760e1a8a9..c89f35e16c9e3 100644 --- a/src/kernel/messagestartchars.h +++ b/src/kernel/messagestartchars.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_MESSAGESTARTCHARS_H -#define BITCOIN_KERNEL_MESSAGESTARTCHARS_H +#ifndef VINCOIN_KERNEL_MESSAGESTARTCHARS_H +#define VINCOIN_KERNEL_MESSAGESTARTCHARS_H #include #include using MessageStartChars = std::array; -#endif // BITCOIN_KERNEL_MESSAGESTARTCHARS_H +#endif // VINCOIN_KERNEL_MESSAGESTARTCHARS_H diff --git a/src/kernel/notifications_interface.h b/src/kernel/notifications_interface.h index 7d08624116ba3..7c0cc7164c975 100644 --- a/src/kernel/notifications_interface.h +++ b/src/kernel/notifications_interface.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_NOTIFICATIONS_INTERFACE_H -#define BITCOIN_KERNEL_NOTIFICATIONS_INTERFACE_H +#ifndef VINCOIN_KERNEL_NOTIFICATIONS_INTERFACE_H +#define VINCOIN_KERNEL_NOTIFICATIONS_INTERFACE_H #include @@ -61,4 +61,4 @@ class Notifications }; } // namespace kernel -#endif // BITCOIN_KERNEL_NOTIFICATIONS_INTERFACE_H +#endif // VINCOIN_KERNEL_NOTIFICATIONS_INTERFACE_H diff --git a/src/kernel/validation_cache_sizes.h b/src/kernel/validation_cache_sizes.h index 66b54909e8f38..a908c597053cd 100644 --- a/src/kernel/validation_cache_sizes.h +++ b/src/kernel/validation_cache_sizes.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_KERNEL_VALIDATION_CACHE_SIZES_H -#define BITCOIN_KERNEL_VALIDATION_CACHE_SIZES_H +#ifndef VINCOIN_KERNEL_VALIDATION_CACHE_SIZES_H +#define VINCOIN_KERNEL_VALIDATION_CACHE_SIZES_H #include