diff --git a/.appveyor.yml b/.appveyor.yml index ac17e2eeb6..8c27d9d5ef 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -33,7 +33,7 @@ before_build: - ps: Start-Process clcache-server - ps: fsutil behavior set disablelastaccess 0 # Enable Access time feature on Windows (for clcache) build_script: -- cmd: msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\bitcoin.sln /m /v:n /nologo +- cmd: msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\defi.sln /m /v:n /nologo after_build: - ps: fsutil behavior set disablelastaccess 1 # Disable Access time feature on Windows (better performance) - ps: clcache -z diff --git a/.gitignore b/.gitignore index 809e851ff1..f09c097a7c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,14 +2,14 @@ *.exe *.pdb -src/bitcoin -src/bitcoind -src/bitcoin-cli -src/bitcoin-tx -src/bitcoin-wallet -src/test/test_bitcoin -src/test/test_bitcoin_fuzzy -src/qt/test/test_bitcoin-qt +src/defi +src/defid +src/defi-cli +src/defi-tx +src/defi-wallet +src/test/test_defi +src/test/test_defi_fuzzy +src/qt/test/test_defi-qt # autoreconf Makefile.in @@ -32,8 +32,8 @@ config.log config.status configure libtool -src/config/bitcoin-config.h -src/config/bitcoin-config.h.in +src/config/defi-config.h +src/config/defi-config.h.in src/config/stamp-h1 src/obj share/setup.nsi @@ -47,11 +47,11 @@ src/qt/forms/ui_*.h src/qt/test/moc*.cpp -src/qt/bitcoin-qt.config -src/qt/bitcoin-qt.creator -src/qt/bitcoin-qt.creator.user -src/qt/bitcoin-qt.files -src/qt/bitcoin-qt.includes +src/qt/defi-qt.config +src/qt/defi-qt.creator +src/qt/defi-qt.creator.user +src/qt/defi-qt.files +src/qt/defi-qt.includes .deps .dirstamp @@ -88,8 +88,8 @@ src/qt/bitcoin-qt.includes *.qm Makefile !depends/Makefile -bitcoin-qt -Bitcoin-Qt.app +defi-qt +Defi-Qt.app background.tiff* # Qt Creator @@ -97,7 +97,7 @@ Makefile.am.user # Unit-tests Makefile.test -bitcoin-qt_test +defi-qt_test # Resources cpp qrc_*.cpp @@ -110,7 +110,7 @@ build *.gcno *.gcda /*.info -test_bitcoin.coverage/ +test_defi.coverage/ total.coverage/ coverage_percent.txt @@ -125,7 +125,7 @@ test/cache/* /doc/doxygen/ -libbitcoinconsensus.pc +libdeficonsensus.pc contrib/devtools/split-debug.sh # Output from running db4 installation diff --git a/.tx/config b/.tx/config index 743510a7f2..2ac26fef82 100644 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[bitcoin.qt-translation-018x] -file_filter = src/qt/locale/bitcoin_.ts -source_file = src/qt/locale/bitcoin_en.ts +[defi.qt-translation-018x] +file_filter = src/qt/locale/defi_.ts +source_file = src/qt/locale/defi_en.ts source_lang = en diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f4a2c081e..36c55666e1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ -Contributing to Bitcoin Core +Contributing to Defi Core ============================ -The Bitcoin Core project operates an open contributor model where anyone is +The Defi Core project operates an open contributor model where anyone is welcome to contribute towards development in the form of peer review, testing and patches. This document explains the practical process and guidelines for contributing. @@ -21,7 +21,7 @@ list. Communication Channels ---------------------- -Most communication about Bitcoin Core development happens on IRC, in the +Most communication about Defi Core development happens on IRC, in the #bitcoin-core-dev channel on Freenode. The easiest way to participate on IRC is with the web client, [webchat.freenode.net](https://webchat.freenode.net/). Chat history logs can be found @@ -81,14 +81,14 @@ the pull request affects. Valid areas as: - `consensus` for changes to consensus critical code - `doc` for changes to the documentation - - `qt` or `gui` for changes to bitcoin-qt + - `qt` or `gui` for changes to defi-qt - `log` for changes to log messages - `mining` for changes to the mining code - `net` or `p2p` for changes to the peer-to-peer network code - `refactor` for structural changes that do not change behavior - `rpc`, `rest` or `zmq` for changes to the RPC, REST or ZMQ APIs - `script` for changes to the scripts and tools - - `test` for changes to the bitcoin unit tests or QA tests + - `test` for changes to the defi unit tests or QA tests - `util` or `lib` for changes to the utils or libraries - `wallet` for changes to the wallet code - `build` for changes to the GNU Autotools, reproducible builds or CI code @@ -194,11 +194,11 @@ workload on reviewing. "Decision Making" Process ------------------------- -The following applies to code changes to the Bitcoin Core project (and related -projects such as libsecp256k1), and is not to be confused with overall Bitcoin +The following applies to code changes to the Defi Core project (and related +projects such as libsecp256k1), and is not to be confused with overall Defi Network Protocol consensus changes. -Whether a pull request is merged into Bitcoin Core rests with the project merge +Whether a pull request is merged into Defi Core rests with the project merge maintainers and ultimately the project lead. Maintainers will take into consideration if a patch is in line with the general @@ -217,7 +217,7 @@ In general, all pull requests must: demonstrating the bug and also proving the fix. This helps prevent regression. - Change relevant comments and documentation when behaviour of code changes. -Patches that change Bitcoin consensus rules are considerably more involved than +Patches that change Defi consensus rules are considerably more involved than normal because they affect the entire ecosystem and so must be preceded by extensive mailing list discussions and have a numbered BIP. While each case will be different, one should be prepared to expend more time and effort than for @@ -272,7 +272,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that mistakes could be very costly to the wider community. This includes refactoring of consensus critical code. -Where a patch set proposes to change the Bitcoin consensus, it must have been +Where a patch set proposes to change the Defi consensus, it must have been discussed extensively on the mailing list and IRC, be accompanied by a widely discussed BIP and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the maintainers. @@ -312,7 +312,7 @@ about: Release Policy -------------- -The project leader is the release manager for each Bitcoin Core release. +The project leader is the release manager for each Defi Core release. Copyright --------- diff --git a/INSTALL.md b/INSTALL.md index 520a47d960..0b6b6f0b4c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,5 +1,5 @@ -Building Bitcoin +Building Defi ================ See doc/build-*.md for instructions on building the various -elements of the Bitcoin Core reference implementation of Bitcoin. +elements of the Defi Core reference implementation of Defi. diff --git a/Makefile.am b/Makefile.am index 8b1e2a6b5b..e8db5fdcb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,22 +11,22 @@ endif export PYTHONPATH -if BUILD_BITCOIN_LIBS +if BUILD_DEFI_LIBS pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libbitcoinconsensus.pc +pkgconfig_DATA = libdeficonsensus.pc endif -BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT) -BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT) -BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT) -BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT) -BITCOIN_WALLET_BIN=$(top_builddir)/src/$(BITCOIN_WALLET_TOOL_NAME)$(EXEEXT) -BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) +DEFID_BIN=$(top_builddir)/src/$(DEFI_DAEMON_NAME)$(EXEEXT) +DEFI_QT_BIN=$(top_builddir)/src/qt/$(DEFI_GUI_NAME)$(EXEEXT) +DEFI_CLI_BIN=$(top_builddir)/src/$(DEFI_CLI_NAME)$(EXEEXT) +DEFI_TX_BIN=$(top_builddir)/src/$(DEFI_TX_NAME)$(EXEEXT) +DEFI_WALLET_BIN=$(top_builddir)/src/$(DEFI_WALLET_TOOL_NAME)$(EXEEXT) +DEFI_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) empty := space := $(empty) $(empty) -OSX_APP=Bitcoin-Qt.app +OSX_APP=Defi-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG=background.svg @@ -35,14 +35,14 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72 OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist -OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns +OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/defi.icns OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md) -DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \ - $(top_srcdir)/contrib/bitcoin-tx.bash-completion \ - $(top_srcdir)/contrib/bitcoind.bash-completion \ +DIST_CONTRIB = $(top_srcdir)/contrib/defi-cli.bash-completion \ + $(top_srcdir)/contrib/defi-tx.bash-completion \ + $(top_srcdir)/contrib/defid.bash-completion \ $(top_srcdir)/contrib/debian/copyright \ $(top_srcdir)/contrib/init \ $(top_srcdir)/contrib/install_db4.sh @@ -53,7 +53,7 @@ DIST_SHARE = \ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \ $(top_srcdir)/contrib/devtools/security-check.py -WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \ +WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/defi.ico \ $(top_srcdir)/share/pixmaps/nsis-header.bmp \ $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \ $(top_srcdir)/doc/README_windows.txt @@ -65,20 +65,20 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \ $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh COVERAGE_INFO = baseline.info \ - test_bitcoin_filtered.info total_coverage.info \ + test_defi_filtered.info total_coverage.info \ baseline_filtered.info functional_test.info functional_test_filtered.info \ - test_bitcoin_coverage.info test_bitcoin.info + test_defi_coverage.info test_defi.info dist-hook: -$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf - -$(BITCOIN_WIN_INSTALLER): all-recursive +$(DEFI_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_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) $(DEFID_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_QT_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_CLI_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_TX_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_WALLET_BIN) $(top_builddir)/release @test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \ echo error: could not build $@ @echo built $@ @@ -95,21 +95,21 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) +$(OSX_APP)/Contents/Resources/defi.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: all-recursive +$(OSX_APP)/Contents/MacOS/Defi-Qt: all-recursive $(MKDIR_P) $(@D) - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@ + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_QT_BIN) $@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(MKDIR_P) $(@D) echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@ OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ - $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ - $(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings + $(OSX_APP)/Contents/Resources/defi.icns $(OSX_APP)/Contents/Info.plist \ + $(OSX_APP)/Contents/MacOS/Defi-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings osx_volname: echo $(OSX_VOLNAME) >$@ @@ -134,7 +134,7 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Defi-Qt $(OSX_DMG): $(APP_DIST_EXTRAS) $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist @@ -149,7 +149,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN) $(PYTHON) $< "$@" "$(OSX_VOLNAME)" -$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Defi-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 deploydir: $(APP_DIST_EXTRAS) @@ -160,22 +160,22 @@ appbundle: $(OSX_APP_BUILT) deploy: $(OSX_DMG) endif if TARGET_WINDOWS -deploy: $(BITCOIN_WIN_INSTALLER) +deploy: $(DEFI_WIN_INSTALLER) endif -$(BITCOIN_QT_BIN): FORCE +$(DEFI_QT_BIN): FORCE $(MAKE) -C src qt/$(@F) -$(BITCOIND_BIN): FORCE +$(DEFID_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_CLI_BIN): FORCE +$(DEFI_CLI_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_TX_BIN): FORCE +$(DEFI_TX_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_WALLET_BIN): FORCE +$(DEFI_WALLET_BIN): FORCE $(MAKE) -C src $(@F) if USE_LCOV @@ -188,16 +188,16 @@ baseline_filtered.info: baseline.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -test_bitcoin.info: baseline_filtered.info +test_defi.info: baseline_filtered.info $(MAKE) -C src/ check - $(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_bitcoin -o $@ + $(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_defi -o $@ $(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src -test_bitcoin_filtered.info: test_bitcoin.info +test_defi_filtered.info: test_defi.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -functional_test.info: test_bitcoin_filtered.info +functional_test.info: test_defi_filtered.info @TIMEOUT=15 test/functional/test_runner.py $(EXTENDED_FUNCTIONAL_TESTS) $(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src --t functional-tests -o $@ $(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src @@ -206,13 +206,13 @@ functional_test_filtered.info: functional_test.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -test_bitcoin_coverage.info: baseline_filtered.info test_bitcoin_filtered.info - $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_bitcoin_filtered.info -o $@ +test_defi_coverage.info: baseline_filtered.info test_defi_filtered.info + $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_defi_filtered.info -o $@ -total_coverage.info: test_bitcoin_filtered.info functional_test_filtered.info - $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_bitcoin_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt +total_coverage.info: test_defi_filtered.info functional_test_filtered.info + $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_defi_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt -test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info +test_defi.coverage/.dirstamp: test_defi_coverage.info $(GENHTML) -s $(LCOV_OPTS) $< -o $(@D) @touch $@ @@ -220,7 +220,7 @@ total.coverage/.dirstamp: total_coverage.info $(GENHTML) -s $(LCOV_OPTS) $< -o $(@D) @touch $@ -cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp +cov: test_defi.coverage/.dirstamp total.coverage/.dirstamp endif @@ -233,8 +233,8 @@ EXTRA_DIST += \ test/fuzz EXTRA_DIST += \ - test/util/bitcoin-util-test.py \ - test/util/data/bitcoin-util-test.json \ + test/util/defi-util-test.py \ + test/util/data/defi-util-test.json \ test/util/data/blanktxv1.hex \ test/util/data/blanktxv1.json \ test/util/data/blanktxv2.hex \ @@ -286,7 +286,7 @@ EXTRA_DIST += \ test/util/data/txcreatesignv2.hex \ test/util/rpcauth-test.py -CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) +CLEANFILES = $(OSX_DMG) $(DEFI_WIN_INSTALLER) .INTERMEDIATE: $(COVERAGE_INFO) @@ -308,7 +308,7 @@ clean-docs: rm -rf doc/doxygen clean-local: clean-docs - rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) + rm -rf coverage_percent.txt test_defi.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__ rm -rf osx_volname dist/ dpi36.background.tiff dpi72.background.tiff diff --git a/README.md b/README.md index 28ee95ee7c..92835a4985 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ -Bitcoin Core integration/staging tree +Defi Core integration/staging tree ===================================== https://bitcoincore.org -What is Bitcoin? +What is Defi? ---------------- -Bitcoin is an experimental digital currency that enables instant payments to -anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate +Defi is an experimental digital currency that enables instant payments to +anyone, anywhere in the world. Defi uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried -out collectively by the network. Bitcoin Core is the name of open source +out collectively by the network. Defi Core is the name of open source software which enables the use of this currency. For more information, as well as an immediately useable, binary version of -the Bitcoin Core software, see https://bitcoincore.org/en/download/, or read the +the Defi Core software, see https://bitcoincore.org/en/download/, or read the [original whitepaper](https://bitcoincore.org/bitcoin.pdf). License ------- -Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more +Defi Core is released under the terms of the MIT license. See [COPYING](COPYING) for more information or see https://opensource.org/licenses/MIT. Development Process @@ -27,7 +27,7 @@ Development Process The `master` branch is regularly built and tested, but is not guaranteed to be completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created -regularly to indicate new official, stable release versions of Bitcoin Core. +regularly to indicate new official, stable release versions of Defi Core. The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md) and useful hints for developers can be found in [doc/developer-notes.md](doc/developer-notes.md). @@ -64,7 +64,7 @@ Translations ------------ Changes to translations as well as new translations can be submitted to -[Bitcoin Core's Transifex page](https://www.transifex.com/bitcoin/bitcoin/). +[Defi Core's Transifex page](https://www.transifex.com/bitcoin/bitcoin/). Translations are periodically pulled from Transifex and merged into the git repository. See the [translation process](doc/translation_process.md) for details on how this works. diff --git a/SECURITY.md b/SECURITY.md index 7ed96c7cea..bb9e55f4f8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,7 +2,7 @@ ## Supported Versions -See our website for versions of Bitcoin Core that are currently supported with +See our website for versions of Defi Core that are currently supported with security updates: https://bitcoincore.org/en/lifecycle/#schedule ## Reporting a Vulnerability diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/defi_find_bdb48.m4 similarity index 94% rename from build-aux/m4/bitcoin_find_bdb48.m4 rename to build-aux/m4/defi_find_bdb48.m4 index ea9c795daa..c45c68cd51 100644 --- a/build-aux/m4/bitcoin_find_bdb48.m4 +++ b/build-aux/m4/defi_find_bdb48.m4 @@ -2,7 +2,7 @@ dnl Copyright (c) 2013-2015 The Bitcoin 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([DEFI_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]) @@ -47,14 +47,14 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[ AC_MSG_RESULT([no]) AC_MSG_ERROR([libdb_cxx headers missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)]) elif test "x$bdb48path" = "xX"; then - BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx) + DEFI_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; wallets opened by this build will not be portable!]) ],[ AC_MSG_ERROR([Found Berkeley DB other than 4.8, required for portable wallets (--with-incompatible-bdb to ignore or --disable-wallet to disable wallet functionality)]) ]) else - BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx) + DEFI_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx) bdbpath="${bdb48path}" fi else diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/defi_qt.m4 similarity index 65% rename from build-aux/m4/bitcoin_qt.m4 rename to build-aux/m4/defi_qt.m4 index 675fb6d3fb..148aeccfbc 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/defi_qt.m4 @@ -3,21 +3,21 @@ dnl Distributed under the MIT software license, see the accompanying 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 bitcoin_enable_qt to false. Else, exit. -AC_DEFUN([BITCOIN_QT_FAIL],[ - if test "x$bitcoin_qt_want_version" = xauto && test "x$bitcoin_qt_force" != xyes; then - if test "x$bitcoin_enable_qt" != xno; then - AC_MSG_WARN([$1; bitcoin-qt frontend will not be built]) +dnl Output: If qt version is auto, set defi_enable_qt to false. Else, exit. +AC_DEFUN([DEFI_QT_FAIL],[ + if test "x$defi_qt_want_version" = xauto && test "x$defi_qt_force" != xyes; then + if test "x$defi_enable_qt" != xno; then + AC_MSG_WARN([$1; defi-qt frontend will not be built]) fi - bitcoin_enable_qt=no - bitcoin_enable_qt_test=no + defi_enable_qt=no + defi_enable_qt_test=no else AC_MSG_ERROR([$1]) fi ]) -AC_DEFUN([BITCOIN_QT_CHECK],[ - if test "x$bitcoin_enable_qt" != xno && test "x$bitcoin_qt_want_version" != xno; then +AC_DEFUN([DEFI_QT_CHECK],[ + if test "x$defi_enable_qt" != xno && test "x$defi_qt_want_version" != xno; then true $1 else @@ -26,43 +26,43 @@ AC_DEFUN([BITCOIN_QT_CHECK],[ fi ]) -dnl BITCOIN_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing]) +dnl DEFI_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([DEFI_QT_PATH_PROGS],[ + DEFI_QT_CHECK([ if test "x$3" != x; then AC_PATH_PROGS($1,$2,,$3) else AC_PATH_PROGS($1,$2) fi if test "x$$1" = x && test "x$4" != xyes; then - BITCOIN_QT_FAIL([$1 not found]) + DEFI_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 DEFI_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([DEFI_QT_INIT],[ dnl enable qt support AC_ARG_WITH([gui], [AS_HELP_STRING([--with-gui@<:@=no|qt5|auto@:>@], - [build bitcoin-qt GUI (default=auto)])], + [build defi-qt GUI (default=auto)])], [ - bitcoin_qt_want_version=$withval - if test "x$bitcoin_qt_want_version" = xyes; then - bitcoin_qt_force=yes - bitcoin_qt_want_version=auto + defi_qt_want_version=$withval + if test "x$defi_qt_want_version" = xyes; then + defi_qt_force=yes + defi_qt_want_version=auto fi ], - [bitcoin_qt_want_version=auto]) + [defi_qt_want_version=auto]) AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], []) AC_ARG_WITH([qt-libdir],[AS_HELP_STRING([--with-qt-libdir=LIB_DIR],[specify qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], []) @@ -83,10 +83,10 @@ dnl Find the appropriate version of Qt libraries and includes. dnl Inputs: $1: Whether or not pkg-config should be used. yes|no. Default: yes. dnl Inputs: $2: If $1 is "yes" and --with-gui=auto, which qt version should be dnl tried first. -dnl Outputs: See _BITCOIN_QT_FIND_LIBS_* +dnl Outputs: See _DEFI_QT_FIND_LIBS_* dnl Outputs: Sets variables for all qt-related tools. -dnl Outputs: bitcoin_enable_qt, bitcoin_enable_qt_dbus, bitcoin_enable_qt_test -AC_DEFUN([BITCOIN_QT_CONFIGURE],[ +dnl Outputs: defi_enable_qt, defi_enable_qt_dbus, defi_enable_qt_test +AC_DEFUN([DEFI_QT_CONFIGURE],[ use_pkgconfig=$1 if test "x$use_pkgconfig" = x; then @@ -94,9 +94,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ fi if test "x$use_pkgconfig" = xyes; then - BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG]) + DEFI_QT_CHECK([_DEFI_QT_FIND_LIBS_WITH_PKGCONFIG]) else - BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG]) + DEFI_QT_CHECK([_DEFI_QT_FIND_LIBS_WITHOUT_PKGCONFIG]) fi dnl This is ugly and complicated. Yuck. Works as follows: @@ -105,28 +105,28 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ dnl the final binary as well. dnl With Qt5, languages moved into core and the WindowsIntegration plugin was dnl added. - dnl _BITCOIN_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the + dnl _DEFI_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the dnl results to QT_LIBS. - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ TEMP_CPPFLAGS=$CPPFLAGS TEMP_CXXFLAGS=$CXXFLAGS CPPFLAGS="$QT_INCLUDES $CPPFLAGS" CXXFLAGS="$PIC_FLAGS $CXXFLAGS" - _BITCOIN_QT_IS_STATIC - if test "x$bitcoin_cv_static_qt" = xyes; then - _BITCOIN_QT_FIND_STATIC_PLUGINS + _DEFI_QT_IS_STATIC + if test "x$defi_cv_static_qt" = xyes; then + _DEFI_QT_FIND_STATIC_PLUGINS AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) - _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal]) + _DEFI_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal]) AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists]) if test "x$TARGET_OS" = xwindows; then - _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows]) + _DEFI_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows]) AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows]) elif test "x$TARGET_OS" = xlinux; then - _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static]) + _DEFI_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static]) AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb]) elif test "x$TARGET_OS" = xdarwin; then AX_CHECK_LINK_FLAG([[-framework IOKit]],[QT_LIBS="$QT_LIBS -framework IOKit"],[AC_MSG_ERROR(could not iokit framework)]) - _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)],[-lqcocoa]) + _DEFI_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)],[-lqcocoa]) AC_DEFINE(QT_QPA_PLATFORM_COCOA, 1, [Define this symbol if the qt platform is cocoa]) fi fi @@ -139,7 +139,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ fi if test "x$use_hardening" != xno; then - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ AC_MSG_CHECKING(whether -fPIE can be used with this Qt config) TEMP_CPPFLAGS=$CPPFLAGS TEMP_CXXFLAGS=$CXXFLAGS @@ -163,7 +163,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ CXXFLAGS=$TEMP_CXXFLAGS ]) else - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ AC_MSG_CHECKING(whether -fPIC is needed with this Qt config) TEMP_CPPFLAGS=$CPPFLAGS CPPFLAGS="$QT_INCLUDES $CPPFLAGS" @@ -185,23 +185,23 @@ 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) + DEFI_QT_PATH_PROGS([MOC], [moc-qt5 moc5 moc], $qt_bin_path) + DEFI_QT_PATH_PROGS([UIC], [uic-qt5 uic5 uic], $qt_bin_path) + DEFI_QT_PATH_PROGS([RCC], [rcc-qt5 rcc5 rcc], $qt_bin_path) + DEFI_QT_PATH_PROGS([LRELEASE], [lrelease-qt5 lrelease5 lrelease], $qt_bin_path) + DEFI_QT_PATH_PROGS([LUPDATE], [lupdate-qt5 lupdate5 lupdate],$qt_bin_path, yes) MOC_DEFS='-DHAVE_CONFIG_H -I$(srcdir)' case $host in *darwin*) - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC" base_frameworks="-framework Foundation -framework ApplicationServices -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([ + DEFI_QT_CHECK([ AX_CHECK_LINK_FLAG([[-mwindows]],[QT_LDFLAGS="$QT_LDFLAGS -mwindows"],[AC_MSG_WARN(-mwindows linker support not detected)]) ]) esac @@ -209,15 +209,15 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ dnl enable qt support AC_MSG_CHECKING(whether to build ]AC_PACKAGE_NAME[ GUI) - BITCOIN_QT_CHECK([ - bitcoin_enable_qt=yes - bitcoin_enable_qt_test=yes + DEFI_QT_CHECK([ + defi_enable_qt=yes + defi_enable_qt_test=yes if test "x$have_qt_test" = xno; then - bitcoin_enable_qt_test=no + defi_enable_qt_test=no fi - bitcoin_enable_qt_dbus=no + defi_enable_qt_dbus=no if test "x$use_dbus" != xno && test "x$have_qt_dbus" = xyes; then - bitcoin_enable_qt_dbus=yes + defi_enable_qt_dbus=yes fi if test "x$use_dbus" = xyes && test "x$have_qt_dbus" = xno; then AC_MSG_ERROR([libQtDBus not found. Install libQtDBus or remove --with-qtdbus.]) @@ -226,9 +226,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ AC_MSG_WARN([lupdate is required to update qt translations]) fi ],[ - bitcoin_enable_qt=no + defi_enable_qt=no ]) - AC_MSG_RESULT([$bitcoin_enable_qt (Qt5)]) + AC_MSG_RESULT([$defi_enable_qt (Qt5)]) AC_SUBST(QT_PIE_FLAGS) AC_SUBST(QT_INCLUDES) @@ -248,9 +248,9 @@ dnl ---- dnl Internal. Check included version of Qt against minimum specified in doc/dependencies.md dnl Requires: INCLUDES must be populated as necessary. -dnl Output: bitcoin_cv_qt5=yes|no -AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[ - AC_CACHE_CHECK(for Qt 5, bitcoin_cv_qt5,[ +dnl Output: defi_cv_qt5=yes|no +AC_DEFUN([_DEFI_QT_CHECK_QT5],[ + AC_CACHE_CHECK(for Qt 5, defi_cv_qt5,[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #ifndef QT_VERSION @@ -262,15 +262,15 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[ choke #endif ]])], - [bitcoin_cv_qt5=yes], - [bitcoin_cv_qt5=no]) + [defi_cv_qt5=yes], + [defi_cv_qt5=no]) ])]) dnl Internal. Check if the included version of Qt is greater than Qt58. dnl Requires: INCLUDES must be populated as necessary. -dnl Output: bitcoin_cv_qt58=yes|no -AC_DEFUN([_BITCOIN_QT_CHECK_QT58],[ - AC_CACHE_CHECK(for > Qt 5.7, bitcoin_cv_qt58,[ +dnl Output: defi_cv_qt58=yes|no +AC_DEFUN([_DEFI_QT_CHECK_QT58],[ + AC_CACHE_CHECK(for > Qt 5.7, defi_cv_qt58,[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #ifndef QT_VERSION @@ -282,18 +282,18 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT58],[ choke #endif ]])], - [bitcoin_cv_qt58=yes], - [bitcoin_cv_qt58=no]) + [defi_cv_qt58=yes], + [defi_cv_qt58=no]) ])]) dnl Internal. Check if the linked version of Qt was built as static libs. dnl Requires: Qt5. dnl Requires: INCLUDES and LIBS must be populated as necessary. -dnl Output: bitcoin_cv_static_qt=yes|no +dnl Output: defi_cv_static_qt=yes|no dnl Output: Defines QT_STATICPLUGIN if plugins are static. -AC_DEFUN([_BITCOIN_QT_IS_STATIC],[ - AC_CACHE_CHECK(for static Qt, bitcoin_cv_static_qt,[ +AC_DEFUN([_DEFI_QT_IS_STATIC],[ + AC_CACHE_CHECK(for static Qt, defi_cv_static_qt,[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #ifndef QT_VERSION OR QT_VERSION_STR @@ -305,10 +305,10 @@ AC_DEFUN([_BITCOIN_QT_IS_STATIC],[ choke #endif ]])], - [bitcoin_cv_static_qt=yes], - [bitcoin_cv_static_qt=no]) + [defi_cv_static_qt=yes], + [defi_cv_static_qt=no]) ]) - if test "x$bitcoin_cv_static_qt" = xyes; then + if test "x$defi_cv_static_qt" = xyes; then AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static Qt plugins]) fi ]) @@ -318,7 +318,7 @@ dnl Requires: INCLUDES and LIBS must be populated as necessary. dnl Inputs: $1: A series of Q_IMPORT_PLUGIN(). dnl Inputs: $2: The libraries that resolve $1. dnl Output: QT_LIBS is prepended or configure exits. -AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[ +AC_DEFUN([_DEFI_QT_CHECK_STATIC_PLUGINS],[ AC_MSG_CHECKING(for static Qt plugins: $2) CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS" LIBS="$2 $QT_LIBS $LIBS" @@ -328,14 +328,14 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[ $1]], [[return 0;]])], [AC_MSG_RESULT(yes); QT_LIBS="$2 $QT_LIBS"], - [AC_MSG_RESULT(no); BITCOIN_QT_FAIL(Could not resolve: $2)]) + [AC_MSG_RESULT(no); DEFI_QT_FAIL(Could not resolve: $2)]) LIBS="$CHECK_STATIC_PLUGINS_TEMP_LIBS" ]) dnl Internal. Find paths necessary for linking qt static plugins dnl Inputs: qt_plugin_path. optional. dnl Outputs: QT_LIBS is appended -AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[ +AC_DEFUN([_DEFI_QT_FIND_STATIC_PLUGINS],[ if test "x$qt_plugin_path" != x; then QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms" if test -d "$qt_plugin_path/accessible"; then @@ -344,7 +344,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[ if test "x$use_pkgconfig" = xyes; then : dnl m4_ifdef([PKG_CHECK_MODULES],[ - if test x$bitcoin_cv_qt58 = xno; then + if test x$defi_cv_qt58 = xno; then PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"]) else PKG_CHECK_MODULES([QTFONTDATABASE], [Qt5FontDatabaseSupport], [QT_LIBS="-lQt5FontDatabaseSupport $QT_LIBS"]) @@ -364,7 +364,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[ ]) else if test "x$TARGET_OS" = xwindows; then - AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[ + AC_CACHE_CHECK(for Qt >= 5.6, defi_cv_need_platformsupport,[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #ifndef QT_VERSION @@ -376,19 +376,19 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[ choke #endif ]])], - [bitcoin_cv_need_platformsupport=yes], - [bitcoin_cv_need_platformsupport=no]) + [defi_cv_need_platformsupport=yes], + [defi_cv_need_platformsupport=no]) ]) - if test "x$bitcoin_cv_need_platformsupport" = xyes; then - if test x$bitcoin_cv_qt58 = xno; then - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXPlatformSupport not found))) + if test "x$defi_cv_need_platformsupport" = xyes; then + if test x$defi_cv_qt58 = xno; then + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,DEFI_QT_FAIL(lib$QT_LIB_PREFIXPlatformSupport not found))) else - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}FontDatabaseSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXFontDatabaseSupport not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}EventDispatcherSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXEventDispatcherSupport not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}ThemeSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXThemeSupport not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}FbSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXFbSupport not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}DeviceDiscoverySupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXDeviceDiscoverySupport not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}AccessibilitySupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXAccessibilitySupport not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}FontDatabaseSupport],[main],,DEFI_QT_FAIL(lib$QT_LIB_PREFIXFontDatabaseSupport not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}EventDispatcherSupport],[main],,DEFI_QT_FAIL(lib$QT_LIB_PREFIXEventDispatcherSupport not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}ThemeSupport],[main],,DEFI_QT_FAIL(lib$QT_LIB_PREFIXThemeSupport not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}FbSupport],[main],,DEFI_QT_FAIL(lib$QT_LIB_PREFIXFbSupport not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}DeviceDiscoverySupport],[main],,DEFI_QT_FAIL(lib$QT_LIB_PREFIXDeviceDiscoverySupport not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}AccessibilitySupport],[main],,DEFI_QT_FAIL(lib$QT_LIB_PREFIXAccessibilitySupport not found))) QT_LIBS="$QT_LIBS -lversion -ldwmapi -luxtheme" fi fi @@ -398,25 +398,25 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[ ]) dnl Internal. Find Qt libraries using pkg-config. -dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to check +dnl Inputs: defi_qt_want_version (from --with-gui=). The version to check dnl first. -dnl Inputs: $1: If bitcoin_qt_want_version is "auto", check for this version +dnl Inputs: $1: If defi_qt_want_version is "auto", check for this version dnl first. 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_WITH_PKGCONFIG],[ +AC_DEFUN([_DEFI_QT_FIND_LIBS_WITH_PKGCONFIG],[ m4_ifdef([PKG_CHECK_MODULES],[ QT_LIB_PREFIX=Qt5 qt5_modules="Qt5Core Qt5Gui Qt5Network Qt5Widgets" - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" have_qt=yes],[have_qt=no]) if test "x$have_qt" != xyes; then have_qt=no - BITCOIN_QT_FAIL([Qt dependencies not found]) + DEFI_QT_FAIL([Qt dependencies not found]) fi ]) - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ PKG_CHECK_MODULES([QT_TEST], [${QT_LIB_PREFIX}Test], [QT_TEST_INCLUDES="$QT_TEST_CFLAGS"; have_qt_test=yes], [have_qt_test=no]) if test "x$use_dbus" != xno; then PKG_CHECK_MODULES([QT_DBUS], [${QT_LIB_PREFIX}DBus], [QT_DBUS_INCLUDES="$QT_DBUS_CFLAGS"; have_qt_dbus=yes], [have_qt_dbus=no]) @@ -428,62 +428,62 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[ dnl Internal. Find Qt libraries without using pkg-config. Version is deduced dnl from the discovered headers. -dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to use. -dnl If "auto", the version will be discovered by _BITCOIN_QT_CHECK_QT5. +dnl Inputs: defi_qt_want_version (from --with-gui=). The version to use. +dnl If "auto", the version will be discovered by _DEFI_QT_CHECK_QT5. 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_WITHOUT_PKGCONFIG],[ +AC_DEFUN([_DEFI_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[ TEMP_CPPFLAGS="$CPPFLAGS" TEMP_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$PIC_FLAGS $CXXFLAGS" TEMP_LIBS="$LIBS" - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ if test "x$qt_include_path" != x; then QT_INCLUDES="-I$qt_include_path -I$qt_include_path/QtCore -I$qt_include_path/QtGui -I$qt_include_path/QtWidgets -I$qt_include_path/QtNetwork -I$qt_include_path/QtTest -I$qt_include_path/QtDBus" CPPFLAGS="$QT_INCLUDES $CPPFLAGS" fi ]) - BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,BITCOIN_QT_FAIL(QtCore headers missing))]) - BITCOIN_QT_CHECK([AC_CHECK_HEADER([QApplication],, BITCOIN_QT_FAIL(QtGui headers missing))]) - BITCOIN_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, BITCOIN_QT_FAIL(QtNetwork headers missing))]) + DEFI_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,DEFI_QT_FAIL(QtCore headers missing))]) + DEFI_QT_CHECK([AC_CHECK_HEADER([QApplication],, DEFI_QT_FAIL(QtGui headers missing))]) + DEFI_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, DEFI_QT_FAIL(QtNetwork headers missing))]) - BITCOIN_QT_CHECK([ - if test "x$bitcoin_qt_want_version" = xauto; then - _BITCOIN_QT_CHECK_QT5 - _BITCOIN_QT_CHECK_QT58 + DEFI_QT_CHECK([ + if test "x$defi_qt_want_version" = xauto; then + _DEFI_QT_CHECK_QT5 + _DEFI_QT_CHECK_QT58 fi QT_LIB_PREFIX=Qt5 ]) - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ LIBS= if test "x$qt_lib_path" != x; then LIBS="$LIBS -L$qt_lib_path" fi if test "x$TARGET_OS" = xwindows; then - AC_CHECK_LIB([imm32], [main],, BITCOIN_QT_FAIL(libimm32 not found)) + AC_CHECK_LIB([imm32], [main],, DEFI_QT_FAIL(libimm32 not found)) fi ]) - BITCOIN_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in]))) - if test x$bitcoin_cv_qt58 = xno; then - BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in]))) - BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in]))) + DEFI_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in]))) + if test x$defi_cv_qt58 = xno; then + DEFI_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in]))) + DEFI_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in]))) else - BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtlibpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in]))) - BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre2_match_16], [qtpcre2 libqtpcre2],,AC_MSG_WARN([libqtpcre2 not found. Assuming qt has it built-in]))) + DEFI_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtlibpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in]))) + DEFI_QT_CHECK(AC_SEARCH_LIBS([pcre2_match_16], [qtpcre2 libqtpcre2],,AC_MSG_WARN([libqtpcre2 not found. Assuming qt has it built-in]))) fi - BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng qtharfbuzz harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled]))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Core not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Network not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Widgets not found))) + DEFI_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng qtharfbuzz harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled]))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,DEFI_QT_FAIL(lib${QT_LIB_PREFIX}Core not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,DEFI_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,DEFI_QT_FAIL(lib${QT_LIB_PREFIX}Network not found))) + DEFI_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,DEFI_QT_FAIL(lib${QT_LIB_PREFIX}Widgets not found))) QT_LIBS="$LIBS" LIBS="$TEMP_LIBS" - BITCOIN_QT_CHECK([ + DEFI_QT_CHECK([ LIBS= if test "x$qt_lib_path" != x; then LIBS="-L$qt_lib_path" diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/defi_subdir_to_include.m4 similarity index 83% rename from build-aux/m4/bitcoin_subdir_to_include.m4 rename to build-aux/m4/defi_subdir_to_include.m4 index 7841042ac8..69155d9665 100644 --- a/build-aux/m4/bitcoin_subdir_to_include.m4 +++ b/build-aux/m4/defi_subdir_to_include.m4 @@ -2,9 +2,9 @@ dnl Copyright (c) 2013-2014 The Bitcoin 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 DEFI_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([DEFI_SUBDIR_TO_INCLUDE],[ if test "x$2" = "x"; then AC_MSG_RESULT([default]) else diff --git a/build_msvc/README.md b/build_msvc/README.md index 2e93979aca..ec3ca21fda 100644 --- a/build_msvc/README.md +++ b/build_msvc/README.md @@ -1,15 +1,15 @@ -Building Bitcoin Core with Visual Studio +Building Defi Core with Visual Studio ======================================== Introduction --------------------- -Solution and project files to build the Bitcoin Core applications (except Qt dependent ones) with Visual Studio 2017 can be found in the build_msvc directory. +Solution and project files to build the Defi Core applications (except Qt dependent ones) with Visual Studio 2017 can be found in the build_msvc directory. Building with Visual Studio is an alternative to the Linux based [cross-compiler build](https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md). Dependencies --------------------- -A number of [open source libraries](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md) are required in order to be able to build Bitcoin. +A number of [open source libraries](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md) are required in order to be able to build Defi. Options for installing the dependencies in a Visual Studio compatible manner are: diff --git a/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in b/build_msvc/bench_defi/bench_defi.vcxproj.in similarity index 81% rename from build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in rename to build_msvc/bench_defi/bench_defi.vcxproj.in index 56401d7618..8d248a8ef6 100644 --- a/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in +++ b/build_msvc/bench_defi/bench_defi.vcxproj.in @@ -12,25 +12,25 @@ @SOURCE_FILES@ - + {2b384fa8-9ee1-4544-93cb-0d733c25e8ce} - + {7c87e378-df58-482e-aa2f-1bc129bc19ce} - + {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - + {460fee33-1fe1-483f-b3bf-931ff8e969a5} - + {b53a5535-ee9d-4c6f-9a26-f79ee3bc3754} - + {93b86837-b543-48a5-a89b-7c87abb77df2} - + {792d487f-f14c-49fc-a9de-3fc150f31c3f} diff --git a/build_msvc/bitcoin-cli/bitcoin-cli.vcxproj b/build_msvc/bitcoin-cli/bitcoin-cli.vcxproj deleted file mode 100644 index e5e0e978f8..0000000000 --- a/build_msvc/bitcoin-cli/bitcoin-cli.vcxproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - {0B2D7431-F876-4A58-87BF-F748338CD3BF} - - - Application - $(SolutionDir)$(Platform)\$(Configuration)\ - - - - - - - {0667528c-d734-4009-adf9-c0d6c4a5a5a6} - - - {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - - - {b53a5535-ee9d-4c6f-9a26-f79ee3bc3754} - - - {5724ba7d-a09a-4ba8-800b-c4c1561b3d69} - - - - - - diff --git a/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj b/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj deleted file mode 100644 index 4e9b4916a0..0000000000 --- a/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - - {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF} - - - Application - $(SolutionDir)$(Platform)\$(Configuration)\ - - - - - - - {2b384fa8-9ee1-4544-93cb-0d733c25e8ce} - - - {7c87e378-df58-482e-aa2f-1bc129bc19ce} - - - {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - - - {b53a5535-ee9d-4c6f-9a26-f79ee3bc3754} - - - {5724ba7d-a09a-4ba8-800b-c4c1561b3d69} - - - {bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6} - - - - - - diff --git a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj deleted file mode 100644 index 40c5db5522..0000000000 --- a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj +++ /dev/null @@ -1,55 +0,0 @@ - - - - - {84DE8790-EDE3-4483-81AC-C32F15E861F4} - - - Application - $(SolutionDir)$(Platform)\$(Configuration)\ - - - - - - - {2b384fa8-9ee1-4544-93cb-0d733c25e8ce} - - - {0667528c-d734-4009-adf9-c0d6c4a5a5a6} - - - {7c87e378-df58-482e-aa2f-1bc129bc19ce} - - - {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - - - {460fee33-1fe1-483f-b3bf-931ff8e969a5} - - - {b53a5535-ee9d-4c6f-9a26-f79ee3bc3754} - - - {93b86837-b543-48a5-a89b-7c87abb77df2} - - - {792d487f-f14c-49fc-a9de-3fc150f31c3f} - - - {5724ba7d-a09a-4ba8-800b-c4c1561b3d69} - - - {f91ac55e-6f5e-4c58-9ac5-b40db7deef93} - - - {bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6} - - - {18430fef-6b61-4c53-b396-718e02850f1b} - - - - - - diff --git a/build_msvc/bitcoind/bitcoind.vcxproj b/build_msvc/bitcoind/bitcoind.vcxproj deleted file mode 100644 index ae24cb100e..0000000000 --- a/build_msvc/bitcoind/bitcoind.vcxproj +++ /dev/null @@ -1,75 +0,0 @@ - - - - - {D4513DDF-6013-44DC-ADCC-12EAF6D1F038} - - - Application - $(SolutionDir)$(Platform)\$(Configuration)\ - - - - - - - {2b384fa8-9ee1-4544-93cb-0d733c25e8ce} - - - {7c87e378-df58-482e-aa2f-1bc129bc19ce} - - - {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - - - {460fee33-1fe1-483f-b3bf-931ff8e969a5} - - - {b53a5535-ee9d-4c6f-9a26-f79ee3bc3754} - - - {93b86837-b543-48a5-a89b-7c87abb77df2} - - - {792d487f-f14c-49fc-a9de-3fc150f31c3f} - - - {5724ba7d-a09a-4ba8-800b-c4c1561b3d69} - - - {bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6} - - - {18430fef-6b61-4c53-b396-718e02850f1b} - - - - - - - ..\..\test\config.ini.in - ..\..\test\config.ini - - - - - - - - - - - - - - - diff --git a/build_msvc/bitcoin.sln b/build_msvc/defi.sln similarity index 85% rename from build_msvc/bitcoin.sln rename to build_msvc/defi.sln index 5a6eaf54ad..8977079555 100644 --- a/build_msvc/bitcoin.sln +++ b/build_msvc/defi.sln @@ -2,39 +2,39 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28803.452 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoinconsensus", "libbitcoinconsensus\libbitcoinconsensus.vcxproj", "{2B384FA8-9EE1-4544-93CB-0D733C25E8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdeficonsensus", "libdeficonsensus\libdeficonsensus.vcxproj", "{2B384FA8-9EE1-4544-93CB-0D733C25E8CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testconsensus", "testconsensus\testconsensus.vcxproj", "{E78473E9-B850-456C-9120-276301E04C06}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoind", "bitcoind\bitcoind.vcxproj", "{D4513DDF-6013-44DC-ADCC-12EAF6D1F038}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "defid", "defid\defid.vcxproj", "{D4513DDF-6013-44DC-ADCC-12EAF6D1F038}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_util", "libbitcoin_util\libbitcoin_util.vcxproj", "{B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdefi_util", "libdefi_util\libdefi_util.vcxproj", "{B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_common", "libbitcoin_common\libbitcoin_common.vcxproj", "{7C87E378-DF58-482E-AA2F-1BC129BC19CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdefi_common", "libdefi_common\libdefi_common.vcxproj", "{7C87E378-DF58-482E-AA2F-1BC129BC19CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_crypto", "libbitcoin_crypto\libbitcoin_crypto.vcxproj", "{6190199C-6CF4-4DAD-BFBD-93FA72A760C1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdefi_crypto", "libdefi_crypto\libdefi_crypto.vcxproj", "{6190199C-6CF4-4DAD-BFBD-93FA72A760C1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_server", "libbitcoin_server\libbitcoin_server.vcxproj", "{460FEE33-1FE1-483F-B3BF-931FF8E969A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdefi_server", "libdefi_server\libdefi_server.vcxproj", "{460FEE33-1FE1-483F-B3BF-931FF8E969A5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunivalue", "libunivalue\libunivalue.vcxproj", "{5724BA7D-A09A-4BA8-800B-C4C1561B3D69}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_wallet", "libbitcoin_wallet\libbitcoin_wallet.vcxproj", "{93B86837-B543-48A5-A89B-7C87ABB77DF2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdefi_wallet", "libdefi_wallet\libdefi_wallet.vcxproj", "{93B86837-B543-48A5-A89B-7C87ABB77DF2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_zmq", "libbitcoin_zmq\libbitcoin_zmq.vcxproj", "{792D487F-F14C-49FC-A9DE-3FC150F31C3F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdefi_zmq", "libdefi_zmq\libdefi_zmq.vcxproj", "{792D487F-F14C-49FC-A9DE-3FC150F31C3F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bitcoin", "test_bitcoin\test_bitcoin.vcxproj", "{A56B73DB-D46D-4882-8374-1FE3FFA08F07}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_defi", "test_defi\test_defi.vcxproj", "{A56B73DB-D46D-4882-8374-1FE3FFA08F07}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_cli", "libbitcoin_cli\libbitcoin_cli.vcxproj", "{0667528C-D734-4009-ADF9-C0D6C4A5A5A6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdefi_cli", "libdefi_cli\libdefi_cli.vcxproj", "{0667528C-D734-4009-ADF9-C0D6C4A5A5A6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoin-cli", "bitcoin-cli\bitcoin-cli.vcxproj", "{0B2D7431-F876-4A58-87BF-F748338CD3BF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "defi-cli", "defi-cli\defi-cli.vcxproj", "{0B2D7431-F876-4A58-87BF-F748338CD3BF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_bitcoin", "bench_bitcoin\bench_bitcoin.vcxproj", "{1125654E-E1B2-4431-8B5C-62EA9A2FEECB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_defi", "bench_defi\bench_defi.vcxproj", "{1125654E-E1B2-4431-8B5C-62EA9A2FEECB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoin-tx", "bitcoin-tx\bitcoin-tx.vcxproj", "{D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "defi-tx", "defi-tx\defi-tx.vcxproj", "{D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoin-wallet", "bitcoin-wallet\bitcoin-wallet.vcxproj", "{84DE8790-EDE3-4483-81AC-C32F15E861F4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "defi-wallet", "defi-wallet\defi-wallet.vcxproj", "{84DE8790-EDE3-4483-81AC-C32F15E861F4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_wallet_tool", "libbitcoin_wallet_tool\libbitcoin_wallet_tool.vcxproj", "{F91AC55E-6F5E-4C58-9AC5-B40DB7DEEF93}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdefi_wallet_tool", "libdefi_wallet_tool\libdefi_wallet_tool.vcxproj", "{F91AC55E-6F5E-4C58-9AC5-B40DB7DEEF93}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsecp256k1", "libsecp256k1\libsecp256k1.vcxproj", "{BB493552-3B8C-4A8C-BF69-A6E7A51D2EA6}" EndProject diff --git a/build_msvc/bitcoin_config.h b/build_msvc/defi_config.h similarity index 98% rename from build_msvc/bitcoin_config.h rename to build_msvc/defi_config.h index 66cc1208a1..25c0f08c14 100644 --- a/build_msvc/bitcoin_config.h +++ b/build_msvc/defi_config.h @@ -1,5 +1,5 @@ -#ifndef BITCOIN_BITCOIN_CONFIG_H -#define BITCOIN_BITCOIN_CONFIG_H +#ifndef DEFI_DEFI_CONFIG_H +#define DEFI_DEFI_CONFIG_H /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ @@ -343,13 +343,13 @@ #define PACKAGE_BUGREPORT "https://github.com/bitcoin/bitcoin/issues" /* Define to the full name of this package. */ -#define PACKAGE_NAME "Bitcoin Core" +#define PACKAGE_NAME "Defi Core" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Bitcoin Core 0.18.99" +#define PACKAGE_STRING "Defi Core 0.18.99" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "bitcoin" +#define PACKAGE_TARNAME "defi" /* Define to the home page for this package. */ #define PACKAGE_URL "https://bitcoincore.org/" @@ -431,4 +431,4 @@ #endif // !WINAPI_FAMILY || WINAPI_FAMILY_DESKTOP_APP -#endif //BITCOIN_BITCOIN_CONFIG_H +#endif //DEFI_DEFI_CONFIG_H diff --git a/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj b/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj deleted file mode 100644 index f21ba7a82b..0000000000 --- a/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj +++ /dev/null @@ -1,946 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - x86-windows-static - x64-windows-static - {2B4ABFF8-D1FD-4845-88C9-1F3C0A6512BF} - - - - "$(QTDIR)\bincc.exe" -name bitcoin "%(Fullpath)" -o .\GeneratedFiles\qrc_bitcoin.cpp - Qt rcc generation for %(Identity) - .\GeneratedFiles\qrc_bitcoin.cpp - (QTDIR)\bincc.exe - - - "$(QTDIR)\bincc.exe" -name bitcoin_locale "%(Fullpath)" -o .\GeneratedFiles\qrc_bitcoin_locale.cpp - Qt rcc generation for %(Identity) - .\GeneratedFiles\qrc_bitcoin_locale.cpp - (QTDIR)\bincc.exe - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - Document - F:\Dependencies\protobuf-cpp-3.4.1\protobuf-3.4.1\cmake\build\vs\Debug\protoc.exe --proto_path=%(RootDir)%(Directory) %(Fullpath) --cpp_out=.\GeneratedFiles - ProtoBuf source generation %(RootDir)%(Directory) %(Filename) - .\GeneratedFiles\%(Filename).pb.h;.\GeneratedFiles\(%Filename).pb.cc - F:\Dependencies\protobuf-cpp-3.4.1\protobuf-3.4.1\cmake\build\vs\Debug\protoc.exe - false - F:\deps\protobuf\protobuf-3.4.1\cmake\build\vs\Debug\protoc.exe --proto_path=%(RootDir)%(Directory) %(Fullpath) --cpp_out=.\GeneratedFiles - F:\deps\protobuf\protobuf-3.4.1\cmake\build\vs\Debug\protoc.exe - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - "$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF) - Qt moc generation for %(Identity) - .\GeneratedFiles\%(Filename).moc - (QTDIR)\bin\moc.exe - - - "$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF) - Qt moc generation for %(Identity) - .\GeneratedFiles\%(Filename).moc - (QTDIR)\bin\moc.exe - - - "$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF) - Qt moc generation for %(Identity) - .\GeneratedFiles\%(Filename).moc - (QTDIR)\bin\moc.exe - - - "$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF) - Qt moc generation for %(Identity) - .\GeneratedFiles\%(Filename).moc - (QTDIR)\bin\moc.exe - - - "$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF) - Qt moc generation for %(Identity) - .\GeneratedFiles\%(Filename).moc - (QTDIR)\bin\moc.exe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - false - static - ClCompile - - - true - static - ClCompile - - - true - static - ClCompile - - - false - static - ClCompile - - - - NotUsing - Level3 - Disabled - true - false - _X86_;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - .\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders - MultiThreaded - - - Console - true - true - true - - - - - NotUsing - Level3 - Disabled - _X86_;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders - MultiThreadedDebug - - - Console - true - - - - - NotUsing - Level3 - Disabled - WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders - MultiThreadedDebug - - - Console - true - - - - - NotUsing - Level3 - MaxSpeed - true - true - WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions) - true - .\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders - MultiThreaded - - - Console - true - true - true - - - - - - There was an error executing the Qt headers moc code generation tasks. - - - - - - - - - There was an error executing the Qt forms code generation tasks. - - - - - - - - - There was an error executing the Qt local code generation tasks. - - - - - - - - - - - - - - - diff --git a/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj b/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj deleted file mode 100644 index 4cb0bdc902..0000000000 --- a/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - - {2B384FA8-9EE1-4544-93CB-0D733C25E8CE} - - - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj.in b/build_msvc/libdefi_cli/libdefi_cli.vcxproj.in similarity index 100% rename from build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj.in rename to build_msvc/libdefi_cli/libdefi_cli.vcxproj.in diff --git a/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in b/build_msvc/libdefi_common/libdefi_common.vcxproj.in similarity index 100% rename from build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in rename to build_msvc/libdefi_common/libdefi_common.vcxproj.in diff --git a/build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj.in b/build_msvc/libdefi_crypto/libdefi_crypto.vcxproj.in similarity index 100% rename from build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj.in rename to build_msvc/libdefi_crypto/libdefi_crypto.vcxproj.in diff --git a/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in b/build_msvc/libdefi_server/libdefi_server.vcxproj.in similarity index 100% rename from build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in rename to build_msvc/libdefi_server/libdefi_server.vcxproj.in diff --git a/build_msvc/libbitcoin_util/libbitcoin_util.vcxproj.in b/build_msvc/libdefi_util/libdefi_util.vcxproj.in similarity index 100% rename from build_msvc/libbitcoin_util/libbitcoin_util.vcxproj.in rename to build_msvc/libdefi_util/libdefi_util.vcxproj.in diff --git a/build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in b/build_msvc/libdefi_wallet/libdefi_wallet.vcxproj.in similarity index 100% rename from build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in rename to build_msvc/libdefi_wallet/libdefi_wallet.vcxproj.in diff --git a/build_msvc/libbitcoin_wallet_tool/libbitcoin_wallet_tool.vcxproj.in b/build_msvc/libdefi_wallet_tool/libdefi_wallet_tool.vcxproj.in similarity index 100% rename from build_msvc/libbitcoin_wallet_tool/libbitcoin_wallet_tool.vcxproj.in rename to build_msvc/libdefi_wallet_tool/libdefi_wallet_tool.vcxproj.in diff --git a/build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj.in b/build_msvc/libdefi_zmq/libdefi_zmq.vcxproj.in similarity index 100% rename from build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj.in rename to build_msvc/libdefi_zmq/libdefi_zmq.vcxproj.in diff --git a/build_msvc/libsecp256k1_config.h b/build_msvc/libsecp256k1_config.h index 5187c946a0..a48f17538c 100644 --- a/build_msvc/libsecp256k1_config.h +++ b/build_msvc/libsecp256k1_config.h @@ -4,8 +4,8 @@ * file COPYING or http://www.opensource.org/licenses/mit-license.php.* **********************************************************************/ -#ifndef BITCOIN_LIBSECP256K1_CONFIG_H -#define BITCOIN_LIBSECP256K1_CONFIG_H +#ifndef DEFI_LIBSECP256K1_CONFIG_H +#define DEFI_LIBSECP256K1_CONFIG_H #undef USE_ASM_X86_64 #undef USE_ENDOMORPHISM @@ -26,4 +26,4 @@ #define USE_FIELD_10X26 1 #define USE_SCALAR_8X32 1 -#endif /* BITCOIN_LIBSECP256K1_CONFIG_H */ +#endif /* DEFI_LIBSECP256K1_CONFIG_H */ diff --git a/build_msvc/msvc-autogen.py b/build_msvc/msvc-autogen.py index 5ddda3c03e..08eefa712b 100644 --- a/build_msvc/msvc-autogen.py +++ b/build_msvc/msvc-autogen.py @@ -9,15 +9,15 @@ DEFAULT_PLATFORM_TOOLSET = R'v141' libs = [ - 'libbitcoin_cli', - 'libbitcoin_common', - 'libbitcoin_crypto', - 'libbitcoin_server', - 'libbitcoin_util', - 'libbitcoin_wallet_tool', - 'libbitcoin_wallet', - 'libbitcoin_zmq', - 'bench_bitcoin', + 'libdefi_cli', + 'libdefi_common', + 'libdefi_crypto', + 'libdefi_server', + 'libdefi_util', + 'libdefi_wallet_tool', + 'libdefi_wallet', + 'libdefi_zmq', + 'bench_defi', ] ignore_list = [ @@ -54,7 +54,7 @@ def set_common_properties(toolset): wfile.write(s) def main(): - parser = argparse.ArgumentParser(description='Bitcoin-core msbuild configuration initialiser.') + parser = argparse.ArgumentParser(description='Defi-core msbuild configuration initialiser.') parser.add_argument('-toolset', nargs='?',help='Optionally sets the msbuild platform toolset, e.g. v142 for Visual Studio 2019.' ' default is %s.'%DEFAULT_PLATFORM_TOOLSET) args = parser.parse_args() @@ -75,7 +75,7 @@ def main(): with open(vcxproj_filename, 'w', encoding='utf-8') as vcxproj_file: vcxproj_file.write(vcxproj_in_file.read().replace( '@SOURCE_FILES@\n', content)) - copyfile(os.path.join(SOURCE_DIR,'../build_msvc/bitcoin_config.h'), os.path.join(SOURCE_DIR, 'config/bitcoin-config.h')) + copyfile(os.path.join(SOURCE_DIR,'../build_msvc/defi_config.h'), os.path.join(SOURCE_DIR, 'config/defi-config.h')) copyfile(os.path.join(SOURCE_DIR,'../build_msvc/libsecp256k1_config.h'), os.path.join(SOURCE_DIR, 'secp256k1/src/libsecp256k1-config.h')) if __name__ == '__main__': diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj deleted file mode 100644 index a5d666c114..0000000000 --- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {51201D5E-D939-4854-AE9D-008F03FF518E} - Win32Proj - test_bitcoinqt - - - - Application - true - v141 - Unicode - - - Application - false - v141 - true - Unicode - - - Application - true - v141 - Unicode - - - Application - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - false - - - true - - - true - - - false - - - - NotUsing - Level3 - MaxSpeed - true - true - WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - NotUsing - Level3 - Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - NotUsing - Level3 - MaxSpeed - true - true - _CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj deleted file mode 100644 index 47e87b59e4..0000000000 --- a/build_msvc/test_bitcoin/test_bitcoin.vcxproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - - {A56B73DB-D46D-4882-8374-1FE3FFA08F07} - - - Application - $(SolutionDir)$(Platform)\$(Configuration)\ - - - - - - - - - - - - - {2b384fa8-9ee1-4544-93cb-0d733c25e8ce} - - - {0667528c-d734-4009-adf9-c0d6c4a5a5a6} - - - {7c87e378-df58-482e-aa2f-1bc129bc19ce} - - - {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - - - {460fee33-1fe1-483f-b3bf-931ff8e969a5} - - - {b53a5535-ee9d-4c6f-9a26-f79ee3bc3754} - - - {93b86837-b543-48a5-a89b-7c87abb77df2} - - - {792d487f-f14c-49fc-a9de-3fc150f31c3f} - - - {5724ba7d-a09a-4ba8-800b-c4c1561b3d69} - - - {bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6} - - - {18430fef-6b61-4c53-b396-718e02850f1b} - - - - - There was an error executing the JSON test header generation task. - - - - - - - - - - - diff --git a/build_msvc/testconsensus/testconsensus.cpp b/build_msvc/testconsensus/testconsensus.cpp index 0068f588cc..9b25686d42 100644 --- a/build_msvc/testconsensus/testconsensus.cpp +++ b/build_msvc/testconsensus/testconsensus.cpp @@ -1,7 +1,7 @@ #include -// bitcoin includes. -#include <..\src\script\bitcoinconsensus.h> +// defi includes. +#include <..\src\script\deficonsensus.h> #include <..\src\primitives\transaction.h> #include <..\src\script\script.h> #include <..\src\streams.h> @@ -27,7 +27,7 @@ CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CSc int main() { - std::cout << "bitcoinconsensus version: " << bitcoinconsensus_version() << std::endl; + std::cout << "deficonsensus version: " << deficonsensus_version() << std::endl; CScript pubKeyScript; pubKeyScript << OP_1 << OP_0 << OP_1; @@ -40,8 +40,8 @@ int main() CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); stream << vanillaSpendTx; - bitcoinconsensus_error err; - auto op0Result = bitcoinconsensus_verify_script_with_amount(pubKeyScript.data(), pubKeyScript.size(), amount, (const unsigned char*)&stream[0], stream.size(), 0, bitcoinconsensus_SCRIPT_FLAGS_VERIFY_ALL, &err); + deficonsensus_error err; + auto op0Result = deficonsensus_verify_script_with_amount(pubKeyScript.data(), pubKeyScript.size(), amount, (const unsigned char*)&stream[0], stream.size(), 0, deficonsensus_SCRIPT_FLAGS_VERIFY_ALL, &err); std::cout << "Op0 result: " << op0Result << ", error code " << err << std::endl; getchar(); diff --git a/build_msvc/testconsensus/testconsensus.vcxproj b/build_msvc/testconsensus/testconsensus.vcxproj index 776c40920a..dd20dcbbf1 100644 --- a/build_msvc/testconsensus/testconsensus.vcxproj +++ b/build_msvc/testconsensus/testconsensus.vcxproj @@ -12,10 +12,10 @@ - + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE} - + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754} diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index c7dea599dc..d1780a3305 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -18,7 +18,7 @@ test/lint/check-doc.py test/lint/check-rpc-mappings.py . test/lint/lint-all.sh -if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" ] && [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then +if [ "$TRAVIS_REPO_SLUG" = "defi/defi" ] && [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then git log --merges --before="2 days ago" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit travis_retry gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $( \$HOME/.bitcoin # Make sure default datadir does not exist and is never read by creating a dummy file +DOCKER_EXEC echo \> \$HOME/.defi # Make sure default datadir does not exist and is never read by creating a dummy file mkdir -p depends/SDKs depends/sdk-sources diff --git a/ci/test/06_script_a.sh b/ci/test/06_script_a.sh index eb6ade7919..22d987e3d2 100755 --- a/ci/test/06_script_a.sh +++ b/ci/test/06_script_a.sh @@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8 -BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$BASE_BUILD_DIR/depends/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib" +DEFI_CONFIG_ALL="--disable-dependency-tracking --prefix=$BASE_BUILD_DIR/depends/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib" if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC ccache --max-size=$CCACHE_SIZE fi @@ -23,17 +23,18 @@ mkdir -p build cd build || (echo "could not enter build directory"; exit 1) BEGIN_FOLD configure -DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) +DOCKER_EXEC ../configure --cache-file=config.cache $DEFI_CONFIG_ALL $DEFI_CONFIG || ( cat config.log && false) END_FOLD BEGIN_FOLD distdir DOCKER_EXEC make distdir VERSION=$HOST +DOCKER_EXEC cp -r ../src/spv/bcash ../src/spv/bitcoin ../src/spv/support ../src/spv/Makefile "defi-$HOST/src/spv/" END_FOLD -cd "bitcoin-$HOST" || (echo "could not enter distdir bitcoin-$HOST"; exit 1) +cd "defi-$HOST" || (echo "could not enter distdir defi-$HOST"; exit 1) BEGIN_FOLD configure -DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) +DOCKER_EXEC ./configure --cache-file=../config.cache $DEFI_CONFIG_ALL $DEFI_CONFIG || ( cat config.log && false) END_FOLD set -o errtrace diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index ea7beae85f..cc5fe5bba9 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8 -cd "build/bitcoin-$HOST" || (echo "could not enter distdir build/bitcoin-$HOST"; exit 1) +cd "build/defi-$HOST" || (echo "could not enter distdir build/defi-$HOST"; exit 1) if [ "$RUN_UNIT_TESTS" = "true" ]; then BEGIN_FOLD unit-tests diff --git a/configure.ac b/configure.ac index 97974d0f14..e7b415867c 100644 --- a/configure.ac +++ b/configure.ac @@ -8,18 +8,18 @@ define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) -define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]]) -AC_INIT([Bitcoin Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/]) +define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Defi Core]]) +AC_INIT([Defi Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/defi/defi/issues],[defi],[https://deficore.org/]) AC_CONFIG_SRCDIR([src/validation.cpp]) -AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) +AC_CONFIG_HEADERS([src/config/defi-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -BITCOIN_DAEMON_NAME=bitcoind -BITCOIN_GUI_NAME=bitcoin-qt -BITCOIN_CLI_NAME=bitcoin-cli -BITCOIN_TX_NAME=bitcoin-tx -BITCOIN_WALLET_TOOL_NAME=bitcoin-wallet +DEFI_DAEMON_NAME=defid +DEFI_GUI_NAME=defi-qt +DEFI_CLI_NAME=defi-cli +DEFI_TX_NAME=defi-tx +DEFI_WALLET_TOOL_NAME=defi-wallet dnl Unless the user specified ARFLAGS, force it to be cr AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to if not set]) @@ -29,9 +29,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 DEFI_CONFIG_H]) +AH_TOP([#define DEFI_CONFIG_H]) +AH_BOTTOM([#endif //DEFI_CONFIG_H]) dnl faketime breaks configure and is only needed for make. Disable it here. unset FAKETIME @@ -435,39 +435,39 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS" AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build bitcoin-cli bitcoin-tx bitcoin-wallet (default=yes)])], - [build_bitcoin_utils=$withval], - [build_bitcoin_utils=yes]) + [build defi-cli defi-tx defi-wallet (default=yes)])], + [build_defi_utils=$withval], + [build_defi_utils=yes]) AC_ARG_ENABLE([util-cli], [AS_HELP_STRING([--enable-util-cli], - [build bitcoin-cli])], - [build_bitcoin_cli=$enableval], - [build_bitcoin_cli=$build_bitcoin_utils]) + [build defi-cli])], + [build_defi_cli=$enableval], + [build_defi_cli=$build_defi_utils]) AC_ARG_ENABLE([util-tx], [AS_HELP_STRING([--enable-util-tx], - [build bitcoin-tx])], - [build_bitcoin_tx=$enableval], - [build_bitcoin_tx=$build_bitcoin_utils]) + [build defi-tx])], + [build_defi_tx=$enableval], + [build_defi_tx=$build_defi_utils]) AC_ARG_ENABLE([util-wallet], [AS_HELP_STRING([--enable-util-wallet], - [build bitcoin-wallet])], - [build_bitcoin_wallet=$enableval], - [build_bitcoin_wallet=$build_bitcoin_utils]) + [build defi-wallet])], + [build_defi_wallet=$enableval], + [build_defi_wallet=$build_defi_utils]) AC_ARG_WITH([libs], [AS_HELP_STRING([--with-libs], [build libraries (default=yes)])], - [build_bitcoin_libs=$withval], - [build_bitcoin_libs=yes]) + [build_defi_libs=$withval], + [build_defi_libs=yes]) AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], - [build bitcoind daemon (default=yes)])], - [build_bitcoind=$withval], - [build_bitcoind=yes]) + [build defid daemon (default=yes)])], + [build_defid=$withval], + [build_defid=yes]) use_pkgconfig=yes case $host in @@ -668,7 +668,7 @@ AC_C_BIGENDIAN dnl Check for pthread compile/link requirements AX_PTHREAD -# The following macro will add the necessary defines to bitcoin-config.h, but +# The following macro will add the necessary defines to defi-config.h, but # they also need to be passed down to any subprojects. Pull the results out of # the cache and add them to CPPFLAGS. AC_SYS_LARGEFILE @@ -959,29 +959,29 @@ AC_SUBST(LIBMEMENV) dnl enable-fuzz should disable all other targets if test "x$enable_fuzz" = "xyes"; then AC_MSG_WARN(enable-fuzz will disable all other targets) - build_bitcoin_utils=no - build_bitcoin_cli=no - build_bitcoin_tx=no - build_bitcoin_wallet=no - build_bitcoind=no - build_bitcoin_libs=no - bitcoin_enable_qt=no - bitcoin_enable_qt_test=no - bitcoin_enable_qt_dbus=no + build_defi_utils=no + build_defi_cli=no + build_defi_tx=no + build_defi_wallet=no + build_defid=no + build_defi_libs=no + defi_enable_qt=no + defi_enable_qt_test=no + defi_enable_qt_dbus=no enable_wallet=no use_bench=no use_upnp=no use_zmq=no else - BITCOIN_QT_INIT + DEFI_QT_INIT - dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig]) + dnl sets $defi_enable_qt, $defi_enable_qt_test, $defi_enable_qt_dbus + DEFI_QT_CONFIGURE([$use_pkgconfig]) fi if test x$enable_wallet != xno; then dnl Check for libdb_cxx only if wallet enabled - BITCOIN_FIND_BDB48 + DEFI_FIND_BDB48 fi dnl Check for libminiupnpc (optional) @@ -1013,7 +1013,7 @@ if test x$have_miniupnpc != xno; then fi fi -if test x$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononononono; then +if test x$build_defi_wallet$build_defi_cli$build_defi_tx$build_defid$defi_enable_qt$use_tests$use_bench = xnonononononono; then use_boost=no else use_boost=yes @@ -1027,7 +1027,7 @@ define(MINIMUM_REQUIRED_BOOST, 1.47.0) dnl Check for boost libs AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST]) if test x$want_boost = xno; then - AC_MSG_ERROR([[only libbitcoinconsensus can be built without boost]]) + AC_MSG_ERROR([[only libdeficonsensus can be built without boost]]) fi AX_BOOST_SYSTEM AX_BOOST_FILESYSTEM @@ -1198,12 +1198,12 @@ if test x$use_pkgconfig = xyes; then PKG_CHECK_MODULES([SSL], [libssl],, [AC_MSG_ERROR(openssl not found.)]) PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)]) if test x$enable_bip70 != xno; then - BITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [have_protobuf=no])]) + DEFI_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [have_protobuf=no])]) fi if test x$use_qr != xno; then - BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) + DEFI_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) fi - if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then + if test x$build_defi_cli$build_defid$defi_enable_qt$use_tests != xnononono; then PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)]) if test x$TARGET_OS != xwindows; then PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)]) @@ -1228,7 +1228,7 @@ else AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),) AC_CHECK_LIB([ssl], [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing)) - if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then + if test x$build_defi_cli$build_defid$defi_enable_qt$use_tests != xnononono; then AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),) AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing)) if test x$TARGET_OS != xwindows; then @@ -1260,11 +1260,11 @@ else fi if test x$enable_bip70 != xno; then - BITCOIN_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], [have_protobuf=no])) + DEFI_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], [have_protobuf=no])) fi if test x$use_qr != xno; then - BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])]) - BITCOIN_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)]) + DEFI_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])]) + DEFI_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)]) fi fi @@ -1295,7 +1295,7 @@ dnl univalue check need_bundled_univalue=yes -if test x$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononononono; then +if test x$build_defi_wallet$build_defi_cli$build_defi_tx$build_defid$defi_enable_qt$use_tests$use_bench = xnonononononono; then need_bundled_univalue=no else @@ -1342,32 +1342,32 @@ AC_SUBST(UNIVALUE_LIBS) if test x$have_protobuf != xno && test x$enable_bip70 != xno; then - BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) + DEFI_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) fi -AC_MSG_CHECKING([whether to build bitcoind]) -AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) -AC_MSG_RESULT($build_bitcoind) +AC_MSG_CHECKING([whether to build defid]) +AM_CONDITIONAL([BUILD_DEFID], [test x$build_defid = xyes]) +AC_MSG_RESULT($build_defid) -AC_MSG_CHECKING([whether to build bitcoin-cli]) -AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) -AC_MSG_RESULT($build_bitcoin_cli) +AC_MSG_CHECKING([whether to build defi-cli]) +AM_CONDITIONAL([BUILD_DEFI_CLI], [test x$build_defi_cli = xyes]) +AC_MSG_RESULT($build_defi_cli) -AC_MSG_CHECKING([whether to build bitcoin-tx]) -AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes]) -AC_MSG_RESULT($build_bitcoin_tx) +AC_MSG_CHECKING([whether to build defi-tx]) +AM_CONDITIONAL([BUILD_DEFI_TX], [test x$build_defi_tx = xyes]) +AC_MSG_RESULT($build_defi_tx) -AC_MSG_CHECKING([whether to build bitcoin-wallet]) -AM_CONDITIONAL([BUILD_BITCOIN_WALLET], [test x$build_bitcoin_wallet = xyes]) -AC_MSG_RESULT($build_bitcoin_wallet) +AC_MSG_CHECKING([whether to build defi-wallet]) +AM_CONDITIONAL([BUILD_DEFI_WALLET], [test x$build_defi_wallet = xyes]) +AC_MSG_RESULT($build_defi_wallet) AC_MSG_CHECKING([whether to build libraries]) -AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -if test x$build_bitcoin_libs = xyes; then +AM_CONDITIONAL([BUILD_DEFI_LIBS], [test x$build_defi_libs = xyes]) +if test x$build_defi_libs = xyes; then AC_DEFINE(HAVE_CONSENSUS_LIB, 1, [Define this symbol if the consensus lib has been built]) - AC_CONFIG_FILES([libbitcoinconsensus.pc:libbitcoinconsensus.pc.in]) + AC_CONFIG_FILES([libdeficonsensus.pc:libdeficonsensus.pc.in]) fi -AC_MSG_RESULT($build_bitcoin_libs) +AC_MSG_RESULT($build_defi_libs) AC_LANG_POP @@ -1430,13 +1430,13 @@ fi dnl these are only used when qt is enabled BUILD_TEST_QT="" -if test x$bitcoin_enable_qt != xno; then +if test x$defi_enable_qt != xno; then dnl enable dbus support AC_MSG_CHECKING([whether to build GUI with support for D-Bus]) - if test x$bitcoin_enable_qt_dbus != xno; then + if test x$defi_enable_qt_dbus != xno; then AC_DEFINE([USE_DBUS],[1],[Define if dbus support should be compiled in]) fi - AC_MSG_RESULT($bitcoin_enable_qt_dbus) + AC_MSG_RESULT($defi_enable_qt_dbus) dnl enable qr support AC_MSG_CHECKING([whether to build GUI with support for QR codes]) @@ -1459,8 +1459,8 @@ if test x$bitcoin_enable_qt != xno; then AC_MSG_WARN("xgettext is required to update qt translations") fi - AC_MSG_CHECKING([whether to build test_bitcoin-qt]) - if test x$use_gui_tests$bitcoin_enable_qt_test = xyesyes; then + AC_MSG_CHECKING([whether to build test_defi-qt]) + if test x$use_gui_tests$defi_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="yes" else @@ -1487,7 +1487,7 @@ fi AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"]) -AC_MSG_CHECKING([whether to build test_bitcoin]) +AC_MSG_CHECKING([whether to build test_defi]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="yes" @@ -1503,7 +1503,7 @@ else AC_MSG_RESULT([no]) fi -if test x$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests = xnononononononono; then +if test x$build_defi_wallet$build_defi_cli$build_defi_tx$build_defi_libs$build_defid$defi_enable_qt$use_bench$use_tests = xnononononononono; then AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-bench or --enable-tests]) fi @@ -1513,7 +1513,7 @@ AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows]) AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet = xyes]) AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes]) AM_CONDITIONAL([ENABLE_FUZZ],[test x$enable_fuzz = xyes]) -AM_CONDITIONAL([ENABLE_QT],[test x$bitcoin_enable_qt = xyes]) +AM_CONDITIONAL([ENABLE_QT],[test x$defi_enable_qt = xyes]) AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes]) AM_CONDITIONAL([ENABLE_BIP70],[test x$enable_bip70 = xyes]) AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes]) @@ -1546,11 +1546,11 @@ 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_CLI_NAME) -AC_SUBST(BITCOIN_TX_NAME) -AC_SUBST(BITCOIN_WALLET_TOOL_NAME) +AC_SUBST(DEFI_DAEMON_NAME) +AC_SUBST(DEFI_GUI_NAME) +AC_SUBST(DEFI_CLI_NAME) +AC_SUBST(DEFI_TX_NAME) +AC_SUBST(DEFI_WALLET_TOOL_NAME) AC_SUBST(RELDFLAGS) AC_SUBST(DEBUG_CPPFLAGS) @@ -1592,7 +1592,7 @@ AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/spl AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])]) AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py]) AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py]) -AC_CONFIG_LINKS([test/util/bitcoin-util-test.py:test/util/bitcoin-util-test.py]) +AC_CONFIG_LINKS([test/util/defi-util-test.py:test/util/defi-util-test.py]) AC_CONFIG_LINKS([test/util/rpcauth-test.py:test/util/rpcauth-test.py]) dnl boost's m4 checks do something really nasty: they export these vars. As a @@ -1649,8 +1649,8 @@ esac echo echo "Options used to compile and link:" echo " with wallet = $enable_wallet" -echo " with gui / qt = $bitcoin_enable_qt" -if test x$bitcoin_enable_qt != xno; then +echo " with gui / qt = $defi_enable_qt" +if test x$defi_enable_qt != xno; then echo " with bip70 = $enable_bip70" echo " with qr = $use_qr" fi diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 0eccbacb96..ee71dce87b 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -75,9 +75,9 @@ Copyright: Stephen Hutchings, Jonas Schnelli License: Expat Comment: Modifications of Stephen Hutchings' Typicons -Files: src/qt/res/icons/bitcoin.* - share/pixmaps/bitcoin* - src/qt/res/src/bitcoin.svg +Files: src/qt/res/icons/defi.* + share/pixmaps/defi* + src/qt/res/src/defi.svg Copyright: Bitboy, Jonas Schnelli License: public-domain Comment: Site: https://bitcointalk.org/?topic=1756.0 diff --git a/contrib/bitcoin-cli.bash-completion b/contrib/defi-cli.bash-completion similarity index 84% rename from contrib/bitcoin-cli.bash-completion rename to contrib/defi-cli.bash-completion index f4cac84182..ddfc520316 100644 --- a/contrib/bitcoin-cli.bash-completion +++ b/contrib/defi-cli.bash-completion @@ -1,10 +1,10 @@ -# bash programmable completion for bitcoin-cli(1) +# bash programmable completion for defi-cli(1) # Copyright (c) 2012-2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -# call $bitcoin-cli for RPC -_bitcoin_rpc() { +# call $defi-cli for RPC +_defi_rpc() { # determine already specified args necessary for RPC local rpcargs=() for i in ${COMP_LINE}; do @@ -14,23 +14,23 @@ _bitcoin_rpc() { ;; esac done - $bitcoin_cli "${rpcargs[@]}" "$@" + $defi_cli "${rpcargs[@]}" "$@" } # Add wallet accounts to COMPREPLY -_bitcoin_accounts() { +_defi_accounts() { local accounts - accounts=$(_bitcoin_rpc listaccounts | awk -F '"' '{ print $2 }') + accounts=$(_defi_rpc listaccounts | awk -F '"' '{ print $2 }') COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) ) } -_bitcoin_cli() { +_defi_cli() { local cur prev words=() cword - local bitcoin_cli + local defi_cli - # save and use original argument to invoke bitcoin-cli for -help, help and RPC - # as bitcoin-cli might not be in $PATH - bitcoin_cli="$1" + # save and use original argument to invoke defi-cli for -help, help and RPC + # as defi-cli might not be in $PATH + defi_cli="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -60,7 +60,7 @@ _bitcoin_cli() { if ((cword > 3)); then case ${words[cword-3]} in addmultisigaddress) - _bitcoin_accounts + _defi_accounts return 0 ;; getbalance|gettxout|importaddress|importpubkey|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock) @@ -85,7 +85,7 @@ _bitcoin_cli() { return 0 ;; move|setaccount) - _bitcoin_accounts + _defi_accounts return 0 ;; esac @@ -101,7 +101,7 @@ _bitcoin_cli() { return 0 ;; getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany) - _bitcoin_accounts + _defi_accounts return 0 ;; esac @@ -125,12 +125,12 @@ _bitcoin_cli() { # only parse -help if senseful if [[ -z "$cur" || "$cur" =~ ^- ]]; then - helpopts=$($bitcoin_cli -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($defi_cli -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) fi # only parse help if senseful if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then - commands=$(_bitcoin_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') + commands=$(_defi_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') fi COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) ) @@ -143,7 +143,7 @@ _bitcoin_cli() { ;; esac } && -complete -F _bitcoin_cli bitcoin-cli +complete -F _defi_cli defi-cli # Local variables: # mode: shell-script diff --git a/contrib/bitcoin-qt.pro b/contrib/defi-qt.pro similarity index 96% rename from contrib/bitcoin-qt.pro rename to contrib/defi-qt.pro index b8133bf789..ace6148378 100644 --- a/contrib/bitcoin-qt.pro +++ b/contrib/defi-qt.pro @@ -18,4 +18,4 @@ FORMS += \ ../src/qt/forms/transactiondescdialog.ui \ RESOURCES += \ - ../src/qt/bitcoin.qrc + ../src/qt/defi.qrc diff --git a/contrib/bitcoin-tx.bash-completion b/contrib/defi-tx.bash-completion similarity index 74% rename from contrib/bitcoin-tx.bash-completion rename to contrib/defi-tx.bash-completion index a83d2979ed..4b6f03d511 100644 --- a/contrib/bitcoin-tx.bash-completion +++ b/contrib/defi-tx.bash-completion @@ -1,15 +1,15 @@ -# bash programmable completion for bitcoin-tx(1) +# bash programmable completion for defi-tx(1) # Copyright (c) 2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -_bitcoin_tx() { +_defi_tx() { local cur prev words=() cword - local bitcoin_tx + local defi_tx - # save and use original argument to invoke bitcoin-tx for -help + # save and use original argument to invoke defi-tx for -help # it might not be in $PATH - bitcoin_tx="$1" + defi_tx="$1" COMPREPLY=() _get_comp_words_by_ref -n =: cur prev words cword @@ -27,15 +27,15 @@ _bitcoin_tx() { if [[ "$cword" == 1 || ( "$prev" != "-create" && "$prev" == -* ) ]]; then # only options (or an uncompletable hex-string) allowed - # parse bitcoin-tx -help for options + # parse defi-tx -help for options local helpopts - helpopts=$($bitcoin_tx -help | sed -e '/^ -/ p' -e d ) + helpopts=$($defi_tx -help | sed -e '/^ -/ p' -e d ) COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) ) else # only commands are allowed # parse -help for commands local helpcmds - helpcmds=$($bitcoin_tx -help | sed -e '1,/Commands:/d' -e 's/=.*/=/' -e '/^ [a-z]/ p' -e d ) + helpcmds=$($defi_tx -help | sed -e '1,/Commands:/d' -e 's/=.*/=/' -e '/^ [a-z]/ p' -e d ) COMPREPLY=( $( compgen -W "$helpcmds" -- "$cur" ) ) fi @@ -46,7 +46,7 @@ _bitcoin_tx() { return 0 } && -complete -F _bitcoin_tx bitcoin-tx +complete -F _defi_tx defi-tx # Local variables: # mode: shell-script diff --git a/contrib/bitcoind.bash-completion b/contrib/defid.bash-completion similarity index 79% rename from contrib/bitcoind.bash-completion rename to contrib/defid.bash-completion index cccd4bde0d..fa8fba8f47 100644 --- a/contrib/bitcoind.bash-completion +++ b/contrib/defid.bash-completion @@ -1,15 +1,15 @@ -# bash programmable completion for bitcoind(1) and bitcoin-qt(1) +# bash programmable completion for defid(1) and defi-qt(1) # Copyright (c) 2012-2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -_bitcoind() { +_defid() { local cur prev words=() cword - local bitcoind + local defid - # save and use original argument to invoke bitcoind for -help + # save and use original argument to invoke defid for -help # it might not be in $PATH - bitcoind="$1" + defid="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -33,7 +33,7 @@ _bitcoind() { # only parse -help if sensible if [[ -z "$cur" || "$cur" =~ ^- ]]; then local helpopts - helpopts=$($bitcoind -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($defid -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) ) fi @@ -45,7 +45,7 @@ _bitcoind() { ;; esac } && -complete -F _bitcoind bitcoind bitcoin-qt +complete -F _defid defid defi-qt # Local variables: # mode: shell-script diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 04fa02484f..3136585ecc 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -92,7 +92,7 @@ BUILDDIR=$PWD/build contrib/devtools/gen-manpages.sh optimize-pngs.py ================ -A script to optimize png files in the bitcoin +A script to optimize png files in the defi repository (requires pngcrush). security-check.py and test-security-check.py @@ -115,10 +115,10 @@ If only supported symbols are used the return value will be 0 and the output wil If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed: - .../64/test_bitcoin: symbol memcpy from unsupported version GLIBC_2.14 - .../64/test_bitcoin: symbol __fdelt_chk from unsupported version GLIBC_2.15 - .../64/test_bitcoin: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 - .../64/test_bitcoin: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 + .../64/test_defi: symbol memcpy from unsupported version GLIBC_2.14 + .../64/test_defi: symbol __fdelt_chk from unsupported version GLIBC_2.15 + .../64/test_defi: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 + .../64/test_defi: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 circular-dependencies.py ======================== diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index fc01e570aa..70c2935472 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -16,7 +16,7 @@ EXCLUDE = [ # auto generated: - 'src/qt/bitcoinstrings.cpp', + 'src/qt/defistrings.cpp', 'src/chainparamsseeds.h', # other external copyrights: 'src/tinyformat.h', @@ -269,7 +269,7 @@ def exec_report(base_directory, verbose): $ ./copyright_header.py report [verbose] Arguments: - - The base directory of a bitcoin source code repository. + - The base directory of a defi source code repository. [verbose] - Includes a list of every file of each subcategory in the report. """ @@ -422,7 +422,7 @@ def exec_update_header_year(base_directory): $ ./copyright_header.py update Arguments: - - The base directory of a bitcoin source code repository. + - The base directory of a defi source code repository. """ def print_file_action_message(filename, action): @@ -544,7 +544,7 @@ def exec_insert_header(filename, style): $ ./copyright_header.py insert Arguments: - - A source file in the bitcoin repository. + - A source file in the defi repository. """ def insert_cmd(argv): diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index dbdb622877..79a9ebbbb4 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -7,24 +7,24 @@ BUILDDIR=${BUILDDIR:-$TOPDIR} BINDIR=${BINDIR:-$BUILDDIR/src} MANDIR=${MANDIR:-$TOPDIR/doc/man} -BITCOIND=${BITCOIND:-$BINDIR/bitcoind} -BITCOINCLI=${BITCOINCLI:-$BINDIR/bitcoin-cli} -BITCOINTX=${BITCOINTX:-$BINDIR/bitcoin-tx} -WALLET_TOOL=${WALLET_TOOL:-$BINDIR/bitcoin-wallet} -BITCOINQT=${BITCOINQT:-$BINDIR/qt/bitcoin-qt} +DEFID=${DEFID:-$BINDIR/defid} +DEFICLI=${DEFICLI:-$BINDIR/defi-cli} +DEFITX=${DEFITX:-$BINDIR/defi-tx} +WALLET_TOOL=${WALLET_TOOL:-$BINDIR/defi-wallet} +DEFIQT=${DEFIQT:-$BINDIR/qt/defi-qt} -[ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1 +[ ! -x $DEFID ] && echo "$DEFID not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -read -r -a BTCVER <<< "$($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')" +read -r -a BTCVER <<< "$($DEFICLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')" # Create a footer file with copyright content. -# This gets autodetected fine for bitcoind if --version-string is not set, -# but has different outcomes for bitcoin-qt and bitcoin-cli. +# This gets autodetected fine for defid if --version-string is not set, +# but has different outcomes for defi-qt and defi-cli. echo "[COPYRIGHT]" > footer.h2m -$BITCOIND --version | sed -n '1!p' >> footer.h2m +$DEFID --version | sed -n '1!p' >> footer.h2m -for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $WALLET_TOOL $BITCOINQT; do +for cmd in $DEFID $DEFICLI $DEFITX $WALLET_TOOL $DEFIQT; do cmdname="${cmd##*/}" help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} sed -i "s/\\\-${BTCVER[1]}//g" ${MANDIR}/${cmdname}.1 diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index dd35d862c9..76b47b7f4c 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -53,7 +53,7 @@ CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt') # Allowed NEEDED libraries ALLOWED_LIBRARIES = { -# bitcoind and bitcoin-qt +# defid and defi-qt 'libgcc_s.so.1', # GCC base support 'libc.so.6', # C library 'libpthread.so.0', # threading @@ -66,7 +66,7 @@ 'ld-linux-aarch64.so.1', # 64-bit ARM dynamic linker 'ld-linux-armhf.so.3', # 32-bit ARM dynamic linker 'ld-linux-riscv64-lp64d.so.1', # 64-bit RISC-V dynamic linker -# bitcoin-qt only +# defi-qt only 'libxcb.so.1', # part of X11 'libfontconfig.so.1', # font support 'libfreetype.so.6', # font parsing diff --git a/contrib/devtools/test_deterministic_coverage.sh b/contrib/devtools/test_deterministic_coverage.sh index 88ac850021..9e03111eb4 100755 --- a/contrib/devtools/test_deterministic_coverage.sh +++ b/contrib/devtools/test_deterministic_coverage.sh @@ -35,7 +35,7 @@ NON_DETERMINISTIC_TESTS=( "wallet_tests/wallet_disableprivkeys" # validation.cpp: if (GetMainSignals().CallbacksPending() > 10) ) -TEST_BITCOIN_BINARY="src/test/test_bitcoin" +TEST_DEFI_BINARY="src/test/test_defi" print_usage() { echo "Usage: $0 [custom test filter (default: all but known non-deterministic tests)] [number of test runs (default: 2)]" @@ -81,8 +81,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_DEFI_BINARY} ]]; then + echo "Error: Executable ${TEST_DEFI_BINARY} not found. Run \"./configure --enable-lcov\" and compile." exit 1 fi @@ -109,7 +109,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_DEFI_BINARY} > "${TEST_OUTPUT_TEMPFILE}" 2>&1; then cat "${TEST_OUTPUT_TEMPFILE}" rm "${TEST_OUTPUT_TEMPFILE}" exit 1 diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index 570d4906cd..53f3d0aa4d 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -24,11 +24,11 @@ def setup(): subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs) if not os.path.isdir('gitian.sigs'): subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin-core/gitian.sigs.git']) - if not os.path.isdir('bitcoin-detached-sigs'): + if not os.path.isdir('defi-detached-sigs'): subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin-core/bitcoin-detached-sigs.git']) if not os.path.isdir('gitian-builder'): subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git']) - if not os.path.isdir('bitcoin'): + if not os.path.isdir('defi'): subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git']) os.chdir('gitian-builder') make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] @@ -46,7 +46,7 @@ def setup(): def build(): global args, workdir - os.makedirs('bitcoin-binaries/' + args.version, exist_ok=True) + os.makedirs('defi-binaries/' + args.version, exist_ok=True) print('\nBuilding Dependencies\n') os.chdir('gitian-builder') os.makedirs('inputs', exist_ok=True) @@ -55,27 +55,27 @@ def build(): subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch']) subprocess.check_call(["echo 'a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 inputs/osslsigncode-Backports-to-1.7.1.patch' | sha256sum -c"], shell=True) subprocess.check_call(["echo 'f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9 inputs/osslsigncode-1.7.1.tar.gz' | sha256sum -c"], shell=True) - subprocess.check_call(['make', '-C', '../bitcoin/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common']) + subprocess.check_call(['make', '-C', '../defi/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common']) if args.linux: print('\nCompiling ' + args.version + ' Linux') - subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'bitcoin='+args.commit, '--url', 'bitcoin='+args.url, '../bitcoin/contrib/gitian-descriptors/gitian-linux.yml']) - subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../bitcoin/contrib/gitian-descriptors/gitian-linux.yml']) - subprocess.check_call('mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/'+args.version, shell=True) + subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'defi='+args.commit, '--url', 'defi='+args.url, '../defi/contrib/gitian-descriptors/gitian-linux.yml']) + subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../defi/contrib/gitian-descriptors/gitian-linux.yml']) + subprocess.check_call('mv build/out/defi-*.tar.gz build/out/src/defi-*.tar.gz ../defi-binaries/'+args.version, shell=True) if args.windows: print('\nCompiling ' + args.version + ' Windows') - subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'bitcoin='+args.commit, '--url', 'bitcoin='+args.url, '../bitcoin/contrib/gitian-descriptors/gitian-win.yml']) - subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-unsigned', '--destination', '../gitian.sigs/', '../bitcoin/contrib/gitian-descriptors/gitian-win.yml']) - subprocess.check_call('mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/', shell=True) - subprocess.check_call('mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/'+args.version, shell=True) + subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'defi='+args.commit, '--url', 'defi='+args.url, '../defi/contrib/gitian-descriptors/gitian-win.yml']) + subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-unsigned', '--destination', '../gitian.sigs/', '../defi/contrib/gitian-descriptors/gitian-win.yml']) + subprocess.check_call('mv build/out/defi-*-win-unsigned.tar.gz inputs/', shell=True) + subprocess.check_call('mv build/out/defi-*.zip build/out/defi-*.exe build/out/src/defi-*.tar.gz ../defi-binaries/'+args.version, shell=True) if args.macos: print('\nCompiling ' + args.version + ' MacOS') - subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'bitcoin='+args.commit, '--url', 'bitcoin='+args.url, '../bitcoin/contrib/gitian-descriptors/gitian-osx.yml']) - subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-unsigned', '--destination', '../gitian.sigs/', '../bitcoin/contrib/gitian-descriptors/gitian-osx.yml']) - subprocess.check_call('mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/', shell=True) - subprocess.check_call('mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/'+args.version, shell=True) + subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'defi='+args.commit, '--url', 'defi='+args.url, '../defi/contrib/gitian-descriptors/gitian-osx.yml']) + subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-unsigned', '--destination', '../gitian.sigs/', '../defi/contrib/gitian-descriptors/gitian-osx.yml']) + subprocess.check_call('mv build/out/defi-*-osx-unsigned.tar.gz inputs/', shell=True) + subprocess.check_call('mv build/out/defi-*.tar.gz build/out/defi-*.dmg build/out/src/defi-*.tar.gz ../defi-binaries/'+args.version, shell=True) os.chdir(workdir) @@ -94,17 +94,17 @@ def sign(): if args.windows: print('\nSigning ' + args.version + ' Windows') - subprocess.check_call('cp inputs/bitcoin-' + args.version + '-win-unsigned.tar.gz inputs/bitcoin-win-unsigned.tar.gz', shell=True) - subprocess.check_call(['bin/gbuild', '--skip-image', '--upgrade', '--commit', 'signature='+args.commit, '../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml']) - subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-signed', '--destination', '../gitian.sigs/', '../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml']) - subprocess.check_call('mv build/out/bitcoin-*win64-setup.exe ../bitcoin-binaries/'+args.version, shell=True) + subprocess.check_call('cp inputs/defi-' + args.version + '-win-unsigned.tar.gz inputs/defi-win-unsigned.tar.gz', shell=True) + subprocess.check_call(['bin/gbuild', '--skip-image', '--upgrade', '--commit', 'signature='+args.commit, '../defi/contrib/gitian-descriptors/gitian-win-signer.yml']) + subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-signed', '--destination', '../gitian.sigs/', '../defi/contrib/gitian-descriptors/gitian-win-signer.yml']) + subprocess.check_call('mv build/out/defi-*win64-setup.exe ../defi-binaries/'+args.version, shell=True) if args.macos: print('\nSigning ' + args.version + ' MacOS') - subprocess.check_call('cp inputs/bitcoin-' + args.version + '-osx-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz', shell=True) - subprocess.check_call(['bin/gbuild', '--skip-image', '--upgrade', '--commit', 'signature='+args.commit, '../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml']) - subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-signed', '--destination', '../gitian.sigs/', '../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml']) - subprocess.check_call('mv build/out/bitcoin-osx-signed.dmg ../bitcoin-binaries/'+args.version+'/bitcoin-'+args.version+'-osx.dmg', shell=True) + subprocess.check_call('cp inputs/defi-' + args.version + '-osx-unsigned.tar.gz inputs/defi-osx-unsigned.tar.gz', shell=True) + subprocess.check_call(['bin/gbuild', '--skip-image', '--upgrade', '--commit', 'signature='+args.commit, '../defi/contrib/gitian-descriptors/gitian-osx-signer.yml']) + subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-signed', '--destination', '../gitian.sigs/', '../defi/contrib/gitian-descriptors/gitian-osx-signer.yml']) + subprocess.check_call('mv build/out/defi-osx-signed.dmg ../defi-binaries/'+args.version+'/defi-'+args.version+'-osx.dmg', shell=True) os.chdir(workdir) @@ -122,27 +122,27 @@ def verify(): os.chdir('gitian-builder') print('\nVerifying v'+args.version+' Linux\n') - if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../bitcoin/contrib/gitian-descriptors/gitian-linux.yml']): + if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../defi/contrib/gitian-descriptors/gitian-linux.yml']): print('Verifying v'+args.version+' Linux FAILED\n') rc = 1 print('\nVerifying v'+args.version+' Windows\n') - if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-unsigned', '../bitcoin/contrib/gitian-descriptors/gitian-win.yml']): + if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-unsigned', '../defi/contrib/gitian-descriptors/gitian-win.yml']): print('Verifying v'+args.version+' Windows FAILED\n') rc = 1 print('\nVerifying v'+args.version+' MacOS\n') - if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-unsigned', '../bitcoin/contrib/gitian-descriptors/gitian-osx.yml']): + if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-unsigned', '../defi/contrib/gitian-descriptors/gitian-osx.yml']): print('Verifying v'+args.version+' MacOS FAILED\n') rc = 1 print('\nVerifying v'+args.version+' Signed Windows\n') - if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-signed', '../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml']): + if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-signed', '../defi/contrib/gitian-descriptors/gitian-win-signer.yml']): print('Verifying v'+args.version+' Signed Windows FAILED\n') rc = 1 print('\nVerifying v'+args.version+' Signed MacOS\n') - if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-signed', '../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml']): + if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-signed', '../defi/contrib/gitian-descriptors/gitian-osx-signer.yml']): print('Verifying v'+args.version+' Signed MacOS FAILED\n') rc = 1 @@ -229,10 +229,10 @@ def main(): raise Exception('Cannot have both commit and pull') args.commit = ('' if args.commit else 'v') + args.version - os.chdir('bitcoin') + os.chdir('defi') if args.pull: subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge']) - os.chdir('../gitian-builder/inputs/bitcoin') + os.chdir('../gitian-builder/inputs/defi') subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge']) args.commit = subprocess.check_output(['git', 'show', '-s', '--format=%H', 'FETCH_HEAD'], universal_newlines=True, encoding='utf8').strip() args.version = 'pull-' + args.version diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index c50750ed44..3a37bb1908 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-core-linux-0.19" +name: "defi-core-linux-0.19" enable_cache: true distro: "ubuntu" suites: @@ -34,7 +34,7 @@ packages: - "python3" remotes: - "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" + "dir": "defi" files: [] script: | set -e -o pipefail @@ -121,7 +121,7 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - cd bitcoin + cd defi BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -143,13 +143,13 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo defi-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar -xf ../$SOURCEDIST - find bitcoin-* | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find defi-* | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index 4cfca403b1..9d54374684 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-dmg-signer" +name: "defi-dmg-signer" distro: "ubuntu" suites: - "bionic" @@ -11,7 +11,7 @@ remotes: - "url": "https://github.com/bitcoin-core/bitcoin-detached-sigs.git" "dir": "signature" files: -- "bitcoin-osx-unsigned.tar.gz" +- "defi-osx-unsigned.tar.gz" script: | set -e -o pipefail @@ -30,8 +30,8 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=bitcoin-osx-unsigned.tar.gz - SIGNED=bitcoin-osx-signed.dmg + UNSIGNED=defi-osx-unsigned.tar.gz + SIGNED=defi-osx-signed.dmg tar -xf ${UNSIGNED} OSX_VOLNAME="$(cat osx_volname)" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 8c51ce7159..372d387474 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-core-osx-0.19" +name: "defi-core-osx-0.19" enable_cache: true distro: "ubuntu" suites: @@ -30,7 +30,7 @@ packages: - "fonts-tuffy" remotes: - "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" + "dir": "defi" files: - "MacOSX10.11.sdk.tar.gz" script: | @@ -85,7 +85,7 @@ script: | create_per-host_faketime_wrappers "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd defi BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs @@ -106,14 +106,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo defi-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar -xf ../$SOURCEDIST - find bitcoin-* | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find defi-* | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 656c6d9b7a..5e6fdd08f5 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-win-signer" +name: "defi-win-signer" distro: "ubuntu" suites: - "bionic" @@ -15,7 +15,7 @@ remotes: files: - "osslsigncode-1.7.1.tar.gz" - "osslsigncode-Backports-to-1.7.1.patch" -- "bitcoin-win-unsigned.tar.gz" +- "defi-win-unsigned.tar.gz" script: | set -e -o pipefail @@ -27,7 +27,7 @@ script: | echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c mkdir -p ${UNSIGNED_DIR} - tar -C ${UNSIGNED_DIR} -xf bitcoin-win-unsigned.tar.gz + tar -C ${UNSIGNED_DIR} -xf defi-win-unsigned.tar.gz tar xf osslsigncode-1.7.1.tar.gz cd osslsigncode-1.7.1 diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index f227c6ad92..41b86d9aa8 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-core-win-0.19" +name: "defi-core-win-0.19" enable_cache: true distro: "ubuntu" suites: @@ -25,7 +25,7 @@ packages: - "rename" remotes: - "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" + "dir": "defi" files: [] script: | set -e -o pipefail @@ -104,7 +104,7 @@ script: | create_per-host_linker_wrapper "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd defi BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -122,14 +122,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo defi-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar -xf ../$SOURCEDIST - find bitcoin-* | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find defi-* | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST mkdir -p $OUTDIR/src cp ../$SOURCEDIST $OUTDIR/src popd @@ -158,7 +158,7 @@ script: | make deploy make install DESTDIR=${INSTALLPATH} rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe - cp -f bitcoin-*setup*.exe $OUTDIR/ + cp -f defi-*setup*.exe $OUTDIR/ cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete @@ -174,7 +174,7 @@ script: | cp -rf contrib/windeploy $BUILD_DIR cd $BUILD_DIR/windeploy mkdir unsigned - cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/ + cp $OUTDIR/defi-*setup-unsigned.exe unsigned/ find . | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip diff --git a/contrib/guix/guix-build.sh b/contrib/guix/guix-build.sh index f8ba8c7ed2..26ddd0c982 100755 --- a/contrib/guix/guix-build.sh +++ b/contrib/guix/guix-build.sh @@ -26,7 +26,7 @@ for host in ${HOSTS=i686-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64- --container \ --pure \ --no-cwd \ - --share="$PWD"=/bitcoin \ + --share="$PWD"=/defi \ ${SOURCES_PATH:+--share="$SOURCES_PATH"} \ ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \ -- env HOST="$host" \ @@ -34,6 +34,6 @@ for host in ${HOSTS=i686-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64- SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \ ${V:+V=1} \ ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} \ - bash -c "cd /bitcoin && bash contrib/guix/libexec/build.sh" + bash -c "cd /defi && bash contrib/guix/libexec/build.sh" done diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 56b972a5cb..84192ba916 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -18,7 +18,7 @@ BASEPREFIX="${PWD}/depends" OUTDIR="${OUTDIR:-${PWD}/output}" [ -e "$OUTDIR" ] || mkdir -p "$OUTDIR" -# Setup the directory where our Bitcoin Core build for HOST will occur +# Setup the directory where our Defi Core build for HOST will occur DISTSRC="${DISTSRC:-${PWD}/distsrc-${HOST}}" if [ -e "$DISTSRC" ]; then echo "DISTSRC directory '${DISTSRC}' exists, probably because of previous builds... Aborting..." @@ -96,7 +96,7 @@ make -C depends --jobs="$MAX_JOBS" HOST="$HOST" \ x86_64_linux_RANLIB=x86_64-linux-gnu-ranlib \ x86_64_linux_NM=x86_64-linux-gnu-nm \ x86_64_linux_STRIP=x86_64-linux-gnu-strip \ - qt_config_opts_i686_linux='-platform linux-g++ -xplatform bitcoin-linux-g++' + qt_config_opts_i686_linux='-platform linux-g++ -xplatform defi-linux-g++' ########################### @@ -104,17 +104,17 @@ make -C depends --jobs="$MAX_JOBS" HOST="$HOST" \ ########################### # Create the source tarball and move it to "${OUTDIR}/src" if not already there -if [ -z "$(find "${OUTDIR}/src" -name 'bitcoin-*.tar.gz')" ]; then +if [ -z "$(find "${OUTDIR}/src" -name 'defi-*.tar.gz')" ]; then ./autogen.sh env CONFIG_SITE="${BASEPREFIX}/${HOST}/share/config.site" ./configure --prefix=/ make dist GZIP_ENV='-9n' ${V:+V=1} mkdir -p "${OUTDIR}/src" - mv "$(find "${PWD}" -name 'bitcoin-*.tar.gz')" "${OUTDIR}/src/" + mv "$(find "${PWD}" -name 'defi-*.tar.gz')" "${OUTDIR}/src/" fi # Determine the full path to our source tarball -SOURCEDIST="$(find "${OUTDIR}/src" -name 'bitcoin-*.tar.gz')" -# Determine our distribution name (e.g. bitcoin-0.18.0) +SOURCEDIST="$(find "${OUTDIR}/src" -name 'defi-*.tar.gz')" +# Determine our distribution name (e.g. defi-0.18.0) DISTNAME="$(basename "$SOURCEDIST" '.tar.gz')" ########################### @@ -156,7 +156,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}" sed -i.old 's/-lstdc++ //g' config.status libtool src/univalue/config.status src/univalue/libtool - # Build Bitcoin Core + # Build Defi Core make --jobs="$MAX_JOBS" ${V:+V=1} # Perform basic ELF security checks on a series of executables. @@ -165,12 +165,12 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}" # version symbols for Linux distro back-compatibility. make -C src --jobs=1 check-symbols ${V:+V=1} - # Setup the directory where our Bitcoin Core build for HOST will be + # Setup the directory where our Defi Core build for HOST will be # installed. This directory will also later serve as the input for our # binary tarballs. INSTALLPATH="${PWD}/installed/${DISTNAME}" mkdir -p "${INSTALLPATH}" - # Install built Bitcoin Core to $INSTALLPATH + # Install built Defi Core to $INSTALLPATH make install DESTDIR="${INSTALLPATH}" ${V:+V=1} ( cd installed diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index ca11d7a0f0..a7c7f84215 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -99,7 +99,7 @@ chain for " target " development.")) (home-page (package-home-page xgcc)) (license (package-license xgcc))))) -(define* (make-bitcoin-cross-toolchain target +(define* (make-defi-cross-toolchain target #:key (base-gcc-for-libc gcc-5) (base-kernel-headers linux-libre-headers-4.19) @@ -107,7 +107,7 @@ chain for " target " development.")) (base-gcc (make-gcc-rpath-link (make-ssp-fixed-gcc gcc-9)))) "Convienience wrapper around MAKE-CROSS-TOOLCHAIN with default values -desirable for building Bitcoin Core release binaries." +desirable for building Defi Core release binaries." (make-cross-toolchain target base-gcc-for-libc base-kernel-headers @@ -147,12 +147,12 @@ desirable for building Bitcoin Core release binaries." ;; Native gcc 9 toolchain targeting glibc 2.27 (make-gcc-toolchain gcc-9 glibc-2.27) ;; Cross gcc 9 toolchains targeting glibc 2.27 - (make-bitcoin-cross-toolchain "i686-linux-gnu") - (make-bitcoin-cross-toolchain "x86_64-linux-gnu") - (make-bitcoin-cross-toolchain "aarch64-linux-gnu") - (make-bitcoin-cross-toolchain "arm-linux-gnueabihf") + (make-defi-cross-toolchain "i686-linux-gnu") + (make-defi-cross-toolchain "x86_64-linux-gnu") + (make-defi-cross-toolchain "aarch64-linux-gnu") + (make-defi-cross-toolchain "arm-linux-gnueabihf") ;; The glibc 2.27 for riscv64 needs gcc 7 to successfully build (see: ;; https://www.gnu.org/software/gcc/gcc-7/changes.html#riscv). The final ;; toolchain is still a gcc 9 toolchain targeting glibc 2.27. - (make-bitcoin-cross-toolchain "riscv64-linux-gnu" + (make-defi-cross-toolchain "riscv64-linux-gnu" #:base-gcc-for-libc gcc-7))) diff --git a/contrib/init/README.md b/contrib/init/README.md index 306a37f75a..268834fea0 100644 --- a/contrib/init/README.md +++ b/contrib/init/README.md @@ -1,11 +1,11 @@ Sample configuration files for: ``` -SystemD: bitcoind.service -Upstart: bitcoind.conf -OpenRC: bitcoind.openrc - bitcoind.openrcconf -CentOS: bitcoind.init -macOS: org.bitcoin.bitcoind.plist +SystemD: defid.service +Upstart: defid.conf +OpenRC: defid.openrc + defid.openrcconf +CentOS: defid.init +macOS: org.defi.defid.plist ``` have been made available to assist packagers in creating node packages here. diff --git a/contrib/init/bitcoind.conf b/contrib/init/bitcoind.conf deleted file mode 100644 index de4ea0ed52..0000000000 --- a/contrib/init/bitcoind.conf +++ /dev/null @@ -1,65 +0,0 @@ -description "Bitcoin Core Daemon" - -start on runlevel [2345] -stop on starting rc RUNLEVEL=[016] - -env BITCOIND_BIN="/usr/bin/bitcoind" -env BITCOIND_USER="bitcoin" -env BITCOIND_GROUP="bitcoin" -env BITCOIND_PIDDIR="/var/run/bitcoind" -# upstart can't handle variables constructed with other variables -env BITCOIND_PIDFILE="/var/run/bitcoind/bitcoind.pid" -env BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf" -env BITCOIND_DATADIR="/var/lib/bitcoind" - -expect fork - -respawn -respawn limit 5 120 -kill timeout 60 - -pre-start script - # this will catch non-existent config files - # bitcoind will check and exit with this very warning, but it can do so - # 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 - echo "ERROR: You must set a secure rpcpassword to run bitcoind." - echo "The setting must appear in $BITCOIND_CONFIGFILE" - echo - echo "This password is security critical to securing wallets " - echo "and must not be the same as the rpcuser setting." - echo "You can generate a suitable random password using the following " - echo "command from the shell:" - echo - echo "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'" - echo - echo "It is recommended that you also set alertnotify so you are " - echo "notified of problems:" - echo - echo "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \ - "admin@foo.com" - echo - 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" -end script - -exec start-stop-daemon \ - --start \ - --pidfile "$BITCOIND_PIDFILE" \ - --chuid $BITCOIND_USER:$BITCOIND_GROUP \ - --exec "$BITCOIND_BIN" \ - -- \ - -pid="$BITCOIND_PIDFILE" \ - -conf="$BITCOIND_CONFIGFILE" \ - -datadir="$BITCOIND_DATADIR" \ - -disablewallet \ - -daemon - diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc deleted file mode 100644 index 86222295db..0000000000 --- a/contrib/init/bitcoind.openrc +++ /dev/null @@ -1,92 +0,0 @@ -#!/sbin/openrc-run - -# backward compatibility for existing gentoo layout -# -if [ -d "/var/lib/bitcoin/.bitcoin" ]; then - BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoin/.bitcoin" -else - BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoind" -fi - -BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/bitcoin/bitcoin.conf} -BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bitcoind} -BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bitcoind.pid} -BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} -BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bitcoin}} -BITCOIND_GROUP=${BITCOIND_GROUP:-bitcoin} -BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind} -BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} -BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" - -name="Bitcoin Core Daemon" -description="Bitcoin cryptocurrency P2P network daemon" - -command="/usr/bin/bitcoind" -command_args="-pid=\"${BITCOIND_PIDFILE}\" \ - -conf=\"${BITCOIND_CONFIGFILE}\" \ - -datadir=\"${BITCOIND_DATADIR}\" \ - -daemon \ - ${BITCOIND_OPTS}" - -required_files="${BITCOIND_CONFIGFILE}" -start_stop_daemon_args="-u ${BITCOIND_USER} \ - -N ${BITCOIND_NICE} -w 2000" -pidfile="${BITCOIND_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}" - -depend() { - need localmount net -} - -# verify -# 1) that the datadir exists and is writable (or create it) -# 2) that a directory for the pid exists and is writable -# 3) ownership and permissions on the config file -start_pre() { - checkpath \ - -d \ - --mode 0750 \ - --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ - "${BITCOIND_DATADIR}" - - checkpath \ - -d \ - --mode 0755 \ - --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ - "${BITCOIND_PIDDIR}" - - checkpath -f \ - -o ${BITCOIND_USER}:${BITCOIND_GROUP} \ - -m 0660 \ - ${BITCOIND_CONFIGFILE} - - checkconfig || return 1 -} - -checkconfig() -{ - if ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then - eerror "" - eerror "ERROR: You must set a secure rpcpassword to run bitcoind." - eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" - eerror "" - eerror "This password is security critical to securing wallets " - eerror "and must not be the same as the rpcuser setting." - eerror "You can generate a suitable random password using the following " - eerror "command from the shell:" - eerror "" - eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'" - eerror "" - eerror "It is recommended that you also set alertnotify so you are " - eerror "notified of problems:" - eerror "" - eerror "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \ - "admin@foo.com" - eerror "" - return 1 - fi -} diff --git a/contrib/init/bitcoind.openrcconf b/contrib/init/bitcoind.openrcconf deleted file mode 100644 index f70e25cb5f..0000000000 --- a/contrib/init/bitcoind.openrcconf +++ /dev/null @@ -1,33 +0,0 @@ -# /etc/conf.d/bitcoind: config file for /etc/init.d/bitcoind - -# Config file location -#BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf" - -# What directory to write pidfile to? (created and owned by $BITCOIND_USER) -#BITCOIND_PIDDIR="/var/run/bitcoind" - -# What filename to give the pidfile -#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/bitcoind.pid" - -# Where to write bitcoind data (be mindful that the blockchain is large) -#BITCOIND_DATADIR="/var/lib/bitcoind" - -# User and group to own bitcoind process -#BITCOIND_USER="bitcoin" -#BITCOIND_GROUP="bitcoin" - -# Path to bitcoind executable -#BITCOIND_BIN="/usr/bin/bitcoind" - -# Nice value to run bitcoind under -#BITCOIND_NICE=0 - -# Additional options (avoid -conf and -datadir, use flags above) -#BITCOIND_OPTS="" - -# The timeout in seconds OpenRC will wait for bitcoind 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=60 diff --git a/contrib/init/defid.conf b/contrib/init/defid.conf new file mode 100644 index 0000000000..a82b3bfd61 --- /dev/null +++ b/contrib/init/defid.conf @@ -0,0 +1,65 @@ +description "Defi Core Daemon" + +start on runlevel [2345] +stop on starting rc RUNLEVEL=[016] + +env DEFID_BIN="/usr/bin/defid" +env DEFID_USER="defi" +env DEFID_GROUP="defi" +env DEFID_PIDDIR="/var/run/defid" +# upstart can't handle variables constructed with other variables +env DEFID_PIDFILE="/var/run/defid/defid.pid" +env DEFID_CONFIGFILE="/etc/defi/defi.conf" +env DEFID_DATADIR="/var/lib/defid" + +expect fork + +respawn +respawn limit 5 120 +kill timeout 60 + +pre-start script + # this will catch non-existent config files + # defid will check and exit with this very warning, but it can do so + # 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=' "$DEFID_CONFIGFILE" ; then + echo "ERROR: You must set a secure rpcpassword to run defid." + echo "The setting must appear in $DEFID_CONFIGFILE" + echo + echo "This password is security critical to securing wallets " + echo "and must not be the same as the rpcuser setting." + echo "You can generate a suitable random password using the following " + echo "command from the shell:" + echo + echo "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'" + echo + echo "It is recommended that you also set alertnotify so you are " + echo "notified of problems:" + echo + echo "ie: alertnotify=echo %%s | mail -s \"Defi Alert\"" \ + "admin@foo.com" + echo + exit 1 + fi + + mkdir -p "$DEFID_PIDDIR" + chmod 0755 "$DEFID_PIDDIR" + chown $DEFID_USER:$DEFID_GROUP "$DEFID_PIDDIR" + chown $DEFID_USER:$DEFID_GROUP "$DEFID_CONFIGFILE" + chmod 0660 "$DEFID_CONFIGFILE" +end script + +exec start-stop-daemon \ + --start \ + --pidfile "$DEFID_PIDFILE" \ + --chuid $DEFID_USER:$DEFID_GROUP \ + --exec "$DEFID_BIN" \ + -- \ + -pid="$DEFID_PIDFILE" \ + -conf="$DEFID_CONFIGFILE" \ + -datadir="$DEFID_DATADIR" \ + -disablewallet \ + -daemon + diff --git a/contrib/init/bitcoind.init b/contrib/init/defid.init similarity index 50% rename from contrib/init/bitcoind.init rename to contrib/init/defid.init index 0c95baf3a1..3a89f6ace6 100644 --- a/contrib/init/bitcoind.init +++ b/contrib/init/defid.init @@ -1,36 +1,36 @@ #!/usr/bin/env bash # -# bitcoind The bitcoin core server. +# defid The defi core server. # # # chkconfig: 345 80 20 -# description: bitcoind -# processname: bitcoind +# description: defid +# processname: defid # # Source function library. . /etc/init.d/functions -# you can override defaults in /etc/sysconfig/bitcoind, see below -if [ -f /etc/sysconfig/bitcoind ]; then - . /etc/sysconfig/bitcoind +# you can override defaults in /etc/sysconfig/defid, see below +if [ -f /etc/sysconfig/defid ]; then + . /etc/sysconfig/defid fi RETVAL=0 -prog=bitcoind -# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/bitcoind -lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/bitcoind} +prog=defid +# you can override the lockfile via DEFID_LOCKFILE in /etc/sysconfig/defid +lockfile=${DEFID_LOCKFILE-/var/lock/subsys/defid} -# bitcoind defaults to /usr/bin/bitcoind, override with BITCOIND_BIN -bitcoind=${BITCOIND_BIN-/usr/bin/bitcoind} +# defid defaults to /usr/bin/defid, override with DEFID_BIN +defid=${DEFID_BIN-/usr/bin/defid} -# bitcoind opts default to -disablewallet, override with BITCOIND_OPTS -bitcoind_opts=${BITCOIND_OPTS--disablewallet} +# defid opts default to -disablewallet, override with DEFID_OPTS +defid_opts=${DEFID_OPTS--disablewallet} start() { echo -n $"Starting $prog: " - daemon $DAEMONOPTS $bitcoind $bitcoind_opts + daemon $DAEMONOPTS $defid $defid_opts RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/contrib/init/defid.openrc b/contrib/init/defid.openrc new file mode 100644 index 0000000000..cfbd1c637e --- /dev/null +++ b/contrib/init/defid.openrc @@ -0,0 +1,92 @@ +#!/sbin/openrc-run + +# backward compatibility for existing gentoo layout +# +if [ -d "/var/lib/defi/.defi" ]; then + DEFID_DEFAULT_DATADIR="/var/lib/defi/.defi" +else + DEFID_DEFAULT_DATADIR="/var/lib/defid" +fi + +DEFID_CONFIGFILE=${DEFID_CONFIGFILE:-/etc/defi/defi.conf} +DEFID_PIDDIR=${DEFID_PIDDIR:-/var/run/defid} +DEFID_PIDFILE=${DEFID_PIDFILE:-${DEFID_PIDDIR}/defid.pid} +DEFID_DATADIR=${DEFID_DATADIR:-${DEFID_DEFAULT_DATADIR}} +DEFID_USER=${DEFID_USER:-${DEFI_USER:-defi}} +DEFID_GROUP=${DEFID_GROUP:-defi} +DEFID_BIN=${DEFID_BIN:-/usr/bin/defid} +DEFID_NICE=${DEFID_NICE:-${NICELEVEL:-0}} +DEFID_OPTS="${DEFID_OPTS:-${DEFI_OPTS}}" + +name="Defi Core Daemon" +description="Defi cryptocurrency P2P network daemon" + +command="/usr/bin/defid" +command_args="-pid=\"${DEFID_PIDFILE}\" \ + -conf=\"${DEFID_CONFIGFILE}\" \ + -datadir=\"${DEFID_DATADIR}\" \ + -daemon \ + ${DEFID_OPTS}" + +required_files="${DEFID_CONFIGFILE}" +start_stop_daemon_args="-u ${DEFID_USER} \ + -N ${DEFID_NICE} -w 2000" +pidfile="${DEFID_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="${DEFID_SIGTERM_TIMEOUT}" + +depend() { + need localmount net +} + +# verify +# 1) that the datadir exists and is writable (or create it) +# 2) that a directory for the pid exists and is writable +# 3) ownership and permissions on the config file +start_pre() { + checkpath \ + -d \ + --mode 0750 \ + --owner "${DEFID_USER}:${DEFID_GROUP}" \ + "${DEFID_DATADIR}" + + checkpath \ + -d \ + --mode 0755 \ + --owner "${DEFID_USER}:${DEFID_GROUP}" \ + "${DEFID_PIDDIR}" + + checkpath -f \ + -o ${DEFID_USER}:${DEFID_GROUP} \ + -m 0660 \ + ${DEFID_CONFIGFILE} + + checkconfig || return 1 +} + +checkconfig() +{ + if ! grep -qs '^rpcpassword=' "${DEFID_CONFIGFILE}" ; then + eerror "" + eerror "ERROR: You must set a secure rpcpassword to run defid." + eerror "The setting must appear in ${DEFID_CONFIGFILE}" + eerror "" + eerror "This password is security critical to securing wallets " + eerror "and must not be the same as the rpcuser setting." + eerror "You can generate a suitable random password using the following " + eerror "command from the shell:" + eerror "" + eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'" + eerror "" + eerror "It is recommended that you also set alertnotify so you are " + eerror "notified of problems:" + eerror "" + eerror "ie: alertnotify=echo %%s | mail -s \"Defi Alert\"" \ + "admin@foo.com" + eerror "" + return 1 + fi +} diff --git a/contrib/init/defid.openrcconf b/contrib/init/defid.openrcconf new file mode 100644 index 0000000000..98ad7b3f5b --- /dev/null +++ b/contrib/init/defid.openrcconf @@ -0,0 +1,33 @@ +# /etc/conf.d/defid: config file for /etc/init.d/defid + +# Config file location +#DEFID_CONFIGFILE="/etc/defi/defi.conf" + +# What directory to write pidfile to? (created and owned by $DEFID_USER) +#DEFID_PIDDIR="/var/run/defid" + +# What filename to give the pidfile +#DEFID_PIDFILE="${DEFID_PIDDIR}/defid.pid" + +# Where to write defid data (be mindful that the blockchain is large) +#DEFID_DATADIR="/var/lib/defid" + +# User and group to own defid process +#DEFID_USER="defi" +#DEFID_GROUP="defi" + +# Path to defid executable +#DEFID_BIN="/usr/bin/defid" + +# Nice value to run defid under +#DEFID_NICE=0 + +# Additional options (avoid -conf and -datadir, use flags above) +#DEFID_OPTS="" + +# The timeout in seconds OpenRC will wait for defid 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. +DEFID_SIGTERM_TIMEOUT=60 diff --git a/contrib/init/bitcoind.service b/contrib/init/defid.service similarity index 69% rename from contrib/init/bitcoind.service rename to contrib/init/defid.service index 34c3e7b3ab..5ffd03f9fb 100644 --- a/contrib/init/bitcoind.service +++ b/contrib/init/defid.service @@ -1,52 +1,52 @@ # It is not recommended to modify this file in-place, because it will # be overwritten during package upgrades. If you want to add further # options or overwrite existing ones then use -# $ systemctl edit bitcoind.service +# $ systemctl edit defid.service # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /etc/bitcoin/bitcoin.conf, but keep in mind those explicitly +# /etc/defi/defi.conf, but keep in mind those explicitly # specified as arguments in ExecStart= will override those in the # config file. [Unit] -Description=Bitcoin daemon +Description=Defi daemon After=network.target [Service] -ExecStart=/usr/bin/bitcoind -daemon \ - -pid=/run/bitcoind/bitcoind.pid \ - -conf=/etc/bitcoin/bitcoin.conf \ - -datadir=/var/lib/bitcoind +ExecStart=/usr/bin/defid -daemon \ + -pid=/run/defid/defid.pid \ + -conf=/etc/defi/defi.conf \ + -datadir=/var/lib/defid # Make sure the config directory is readable by the service user PermissionsStartOnly=true -ExecStartPre=/bin/chgrp bitcoin /etc/bitcoin +ExecStartPre=/bin/chgrp defi /etc/defi # Process management #################### Type=forking -PIDFile=/run/bitcoind/bitcoind.pid +PIDFile=/run/defid/defid.pid Restart=on-failure # Directory creation and permissions #################################### -# Run as bitcoin:bitcoin -User=bitcoin -Group=bitcoin +# Run as defi:defi +User=defi +Group=defi -# /run/bitcoind -RuntimeDirectory=bitcoind +# /run/defid +RuntimeDirectory=defid RuntimeDirectoryMode=0710 -# /etc/bitcoin -ConfigurationDirectory=bitcoin +# /etc/defi +ConfigurationDirectory=defi ConfigurationDirectoryMode=0710 -# /var/lib/bitcoind -StateDirectory=bitcoind +# /var/lib/defid +StateDirectory=defid StateDirectoryMode=0710 # Hardening measures diff --git a/contrib/init/org.bitcoin.bitcoind.plist b/contrib/init/org.bitcoin.bitcoind.plist deleted file mode 100644 index 95b5342f1e..0000000000 --- a/contrib/init/org.bitcoin.bitcoind.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Label - org.bitcoin.bitcoind - ProgramArguments - - /usr/local/bin/bitcoind - - RunAtLoad - - - diff --git a/contrib/install_db4.sh b/contrib/install_db4.sh index 4b848dda99..c6749e0160 100755 --- a/contrib/install_db4.sh +++ b/contrib/install_db4.sh @@ -9,7 +9,7 @@ if [ -z "${1}" ]; then echo "Usage: $0 [ ...]" echo echo "Must specify a single argument: the directory in which db4 will be built." - echo "This is probably \`pwd\` if you're at the root of the bitcoin repository." + echo "This is probably \`pwd\` if you're at the root of the defi repository." exit 1 fi @@ -96,7 +96,7 @@ echo echo "db4 build complete." echo # shellcheck disable=SC2016 -echo 'When compiling bitcoind, run `./configure` in the following way:' +echo 'When compiling defid, run `./configure` in the following way:' echo echo " export BDB_PREFIX='${BDB_PREFIX}'" # shellcheck disable=SC2016 diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index 25a1c7351a..a7b4bd926c 100644 --- a/contrib/linearize/README.md +++ b/contrib/linearize/README.md @@ -1,5 +1,5 @@ # Linearize -Construct a linear, no-fork, best version of the Bitcoin blockchain. +Construct a linear, no-fork, best version of the Defi blockchain. ## Step 1: Download hash list @@ -20,7 +20,7 @@ standalone hash lists but safe to use with linearize-data.py, which will output the same data no matter which byte format is chosen. The `linearize-hashes` script requires a connection, local or remote, to a -JSON-RPC server. Running `bitcoind` or `bitcoin-qt -server` will be sufficient. +JSON-RPC server. Running `defid` or `defi-qt -server` will be sufficient. ## Step 2: Copy local block data @@ -38,7 +38,7 @@ will be printed. respectively, to the current time and to the timestamp of the most recent block written to the script's blockchain. * `genesis`: The hash of the genesis block in the blockchain. -* `input`: bitcoind blocks/ directory containing blkNNNNN.dat +* `input`: defid blocks/ directory containing blkNNNNN.dat * `hashlist`: text file containing list of block hashes created by linearize-hashes.py. * `max_out_sz`: Maximum size for files created by the `output_file` option. diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 2315898bf1..626f741927 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -1,7 +1,7 @@ -# bitcoind RPC settings (linearize-hashes) +# defid RPC settings (linearize-hashes) rpcuser=someuser rpcpassword=somepassword -#datadir=~/.bitcoin +#datadir=~/.defi host=127.0.0.1 #mainnet default @@ -21,12 +21,12 @@ max_height=313000 # mainnet netmagic=f9beb4d9 genesis=000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f -input=/home/example/.bitcoin/blocks +input=/home/example/.defi/blocks # testnet #netmagic=0b110907 #genesis=000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943 -#input=/home/example/.bitcoin/testnet3/blocks +#input=/home/example/.defi/testnet3/blocks # "output" option causes blockchain files to be written to the given location, # with "output_file" ignored. If not used, "output_file" is used instead. diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 8529470e09..4746c6d85a 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -22,7 +22,7 @@ def hex_switchEndian(s): pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)] return b''.join(pairList[::-1]).decode() -class BitcoinRPC: +class DefiRPC: def __init__(self, host, port, username, password): authpair = "%s:%s" % (username, password) authpair = authpair.encode('utf-8') @@ -64,7 +64,7 @@ def response_is_error(resp_obj): return 'error' in resp_obj and resp_obj['error'] is not None def get_block_hashes(settings, max_blocks_per_call=10000): - rpc = BitcoinRPC(settings['host'], settings['port'], + rpc = DefiRPC(settings['host'], settings['port'], settings['rpcuser'], settings['rpcpassword']) height = settings['min_height'] diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 6163734e62..aae58b49a4 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -11,5 +11,5 @@ This script should not be run manually, instead, after building as usual: During the process, the disk image window will pop up briefly where the fancy settings are applied. This is normal, please do not interfere. -When finished, it will produce `Bitcoin-Core.dmg`. +When finished, it will produce `Defi-Core.dmg`. diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index dc1c1882dd..8c11eb1953 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -27,7 +27,7 @@ 'gridOffsetX': 0.0, 'textSize': 12.0, 'viewOptionsVersion': 1, - 'backgroundImageAlias': b'\x00\x00\x00\x00\x02\x1e\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd1\x94\\\xb0H+\x00\x05\x00\x00\x00\x98\x0fbackground.tiff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x99\xd19\xb0\xf8\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\r\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b.background\x00\x00\x10\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x11\x00\x08\x00\x00\xd19\xb0\xf8\x00\x00\x00\x01\x00\x04\x00\x00\x00\x98\x00\x0e\x00 \x00\x0f\x00b\x00a\x00c\x00k\x00g\x00r\x00o\x00u\x00n\x00d\x00.\x00t\x00i\x00f\x00f\x00\x0f\x00\x02\x00\x00\x00\x12\x00\x1c/.background/background.tiff\x00\x14\x01\x06\x00\x00\x00\x00\x01\x06\x00\x02\x00\x00\x0cMacintosh HD\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xce\x97\xab\xc3H+\x00\x00\x01\x88[\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02u\xab\x8d\xd1\x94\\\xb0devrddsk\xff\xff\xff\xff\x00\x00\t \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07bitcoin\x00\x00\x10\x00\x08\x00\x00\xce\x97\xab\xc3\x00\x00\x00\x11\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x01\x00\x14\x01\x88[\x88\x00\x16\xa9\t\x00\x08\xfaR\x00\x08\xfaQ\x00\x02d\x8e\x00\x0e\x00\x02\x00\x00\x00\x0f\x00\x1a\x00\x0c\x00M\x00a\x00c\x00i\x00n\x00t\x00o\x00s\x00h\x00 \x00H\x00D\x00\x13\x00\x01/\x00\x00\x15\x00\x02\x00\x14\xff\xff\x00\x00\xff\xff\x00\x00', + 'backgroundImageAlias': b'\x00\x00\x00\x00\x02\x1e\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd1\x94\\\xb0H+\x00\x05\x00\x00\x00\x98\x0fbackground.tiff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x99\xd19\xb0\xf8\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\r\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b.background\x00\x00\x10\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x11\x00\x08\x00\x00\xd19\xb0\xf8\x00\x00\x00\x01\x00\x04\x00\x00\x00\x98\x00\x0e\x00 \x00\x0f\x00b\x00a\x00c\x00k\x00g\x00r\x00o\x00u\x00n\x00d\x00.\x00t\x00i\x00f\x00f\x00\x0f\x00\x02\x00\x00\x00\x12\x00\x1c/.background/background.tiff\x00\x14\x01\x06\x00\x00\x00\x00\x01\x06\x00\x02\x00\x00\x0cMacintosh HD\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xce\x97\xab\xc3H+\x00\x00\x01\x88[\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02u\xab\x8d\xd1\x94\\\xb0devrddsk\xff\xff\xff\xff\x00\x00\t \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07defi\x00\x00\x10\x00\x08\x00\x00\xce\x97\xab\xc3\x00\x00\x00\x11\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x01\x00\x14\x01\x88[\x88\x00\x16\xa9\t\x00\x08\xfaR\x00\x08\xfaQ\x00\x02d\x8e\x00\x0e\x00\x02\x00\x00\x00\x0f\x00\x1a\x00\x0c\x00M\x00a\x00c\x00i\x00n\x00t\x00o\x00s\x00h\x00 \x00H\x00D\x00\x13\x00\x01/\x00\x00\x15\x00\x02\x00\x14\xff\xff\x00\x00\xff\xff\x00\x00', 'backgroundColorBlue': 1.0, 'iconSize': 96.0, 'backgroundColorGreen': 1.0, @@ -44,8 +44,8 @@ alias.volume.name = package_name_ns alias.volume.posix_path = '/Volumes/' + package_name_ns alias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg' -alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00bitcoinuser:\x00Documents:\x00bitcoin:\x00bitcoin:\x00' + package_name_ns + '.temp.dmg' -alias.volume.disk_image_alias.target.posix_path = 'Users/bitcoinuser/Documents/bitcoin/bitcoin/' + package_name_ns + '.temp.dmg' +alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00defiuser:\x00Documents:\x00defi:\x00defi:\x00' + package_name_ns + '.temp.dmg' +alias.volume.disk_image_alias.target.posix_path = 'Users/defiuser/Documents/defi/defi/' + package_name_ns + '.temp.dmg' alias.target.carbon_path = package_name_ns + ':.background:\x00background.tiff' icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes()) ds['.']['icvp'] = icvp @@ -53,7 +53,7 @@ ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['Bitcoin-Qt.app']['Iloc'] = (128, 156) +ds['Defi-Qt.app']['Iloc'] = (128, 156) ds.flush() ds.close() diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index 938bcd1638..9947bbac99 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -7,7 +7,7 @@ export LC_ALL=C set -e ROOTDIR=dist -BUNDLE="${ROOTDIR}/Bitcoin-Qt.app" +BUNDLE="${ROOTDIR}/Defi-Qt.app" CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index ef277a7f14..8691c1afd1 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Bitcoin-Qt.app + Defi-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 9da03e5b02..28b26ebe28 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -154,7 +154,7 @@ class FrameworkInfo(object): class ApplicationBundleInfo(object): def __init__(self, path): self.path = path - appName = "Bitcoin-Qt" + appName = "Defi-Qt" self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) if not os.path.exists(self.binaryPath): raise RuntimeError("Could not find bundle binary for " + path) @@ -596,7 +596,7 @@ else: # ------------------------------------------------ -target = os.path.join("dist", "Bitcoin-Qt.app") +target = os.path.join("dist", "Defi-Qt.app") if verbose >= 2: print("+ Copying source bundle +") diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 0ded87c58f..f448a20b29 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### QoS (Quality of service) ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN. +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Defi network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN. -This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. +This means one can have an always-on defid instance running, and another local defid/defi-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index ccb0f4f895..7d233522d8 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -9,7 +9,7 @@ export LC_ALL=C IF="eth0" #limit of the network interface in question LINKCEIL="1gbit" -#limit outbound Bitcoin protocol traffic to this rate +#limit outbound Defi protocol traffic to this rate LIMIT="160kbit" #defines the IPv4 address space for which you wish to disable rate limiting LOCALNET_V4="192.168.0.0/16" diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index fe7cd1d597..be51721aad 100755 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -118,10 +118,10 @@ 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 DEFI_CHAINPARAMSSEEDS_H\n') + g.write('#define DEFI_CHAINPARAMSSEEDS_H\n') g.write('/**\n') - g.write(' * List of fixed seed nodes for the bitcoin network\n') + g.write(' * List of fixed seed nodes for the defi network\n') g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n') g.write(' *\n') g.write(' * Each line contains a 16-byte IPv6 address and a port.\n') @@ -132,7 +132,7 @@ def main(): g.write('\n') with open(os.path.join(indir,'nodes_test.txt'), 'r', encoding="utf8") as f: process_nodes(g, f, 'pnSeed6_test', 18333) - g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') + g.write('#endif // DEFI_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': main() diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 523386e393..44158b76fa 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -164,7 +164,7 @@ def main(): ips = [ip for ip in ips if PATTERN_AGENT.match(ip['agent'])] # Sort by availability (and use last success as tie breaker) ips.sort(key=lambda x: (x['uptime'], x['lastsuccess'], x['ip']), reverse=True) - # Filter out hosts with multiple bitcoin ports, these are likely abusive + # Filter out hosts with multiple defi ports, these are likely abusive ips = filtermultiport(ips) # Look up ASNs and limit results, both per ASN and globally. ips = filterbyasn(ips, MAX_SEEDS_PER_ASN, NSEEDS) diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index 580ed541cf..b74a328a9e 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -1,6 +1,6 @@ ### TestGen ### -Utilities to generate test vectors for the data-driven Bitcoin tests. +Utilities to generate test vectors for the data-driven Defi tests. Usage: diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py index da67cb2d90..1aa8841920 100644 --- a/contrib/testgen/base58.py +++ b/contrib/testgen/base58.py @@ -2,7 +2,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' -Bitcoin base58 encoding and decoding. +Defi base58 encoding and decoding. Based on https://bitcointalk.org/index.php?topic=1026.0 (public domain) ''' @@ -39,7 +39,7 @@ def b58encode(v): long_value = div result = __b58chars[long_value] + result - # Bitcoin does a little leading-zero-compression: + # Defi does a little leading-zero-compression: # leading 0-bytes in the input become leading-1s nPad = 0 for c in v: diff --git a/contrib/valgrind.supp b/contrib/valgrind.supp index 0f6d993fd2..969c597595 100644 --- a/contrib/valgrind.supp +++ b/contrib/valgrind.supp @@ -1,12 +1,12 @@ -# Valgrind suppressions file for Bitcoin. +# Valgrind suppressions file for Defi. # # Includes known Valgrind warnings in our dependencies that cannot be fixed # in-tree. # # Example use: -# $ valgrind --suppressions=contrib/valgrind.supp src/test/test_bitcoin +# $ valgrind --suppressions=contrib/valgrind.supp src/test/test_defi # $ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \ -# --show-leak-kinds=all src/test/test_bitcoin --log_level=test_suite +# --show-leak-kinds=all src/test/test_defi --log_level=test_suite { Suppress libstdc++ warning - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65434 Memcheck:Leak diff --git a/contrib/verify-commits/README.md b/contrib/verify-commits/README.md index 1215962a16..bb60d7cc6a 100644 --- a/contrib/verify-commits/README.md +++ b/contrib/verify-commits/README.md @@ -53,5 +53,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 DEFI_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 288e4ccacb..bcf7422036 100755 --- a/contrib/verify-commits/gpg.sh +++ b/contrib/verify-commits/gpg.sh @@ -9,7 +9,7 @@ VALID=false REVSIG=false IFS=' ' -if [ "$BITCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then +if [ "$DEFI_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then GPG_RES="$(printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)" else # Note how we've disabled SHA1 with the --weak-digest option, disabling @@ -43,12 +43,12 @@ for LINE in $GPG_RES; do done < ./contrib/verify-commits/trusted-keys ;; "[GNUPG:] REVKEYSIG "*) - [ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1 + [ "$DEFI_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1 REVSIG=true GOODREVSIG="[GNUPG:] GOODSIG ${LINE#* * *}" ;; "[GNUPG:] EXPKEYSIG "*) - [ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1 + [ "$DEFI_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1 REVSIG=true GOODREVSIG="[GNUPG:] GOODSIG ${LINE#* * *}" ;; diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py index 9ec8663fba..e14e88f495 100755 --- a/contrib/verify-commits/verify-commits.py +++ b/contrib/verify-commits/verify-commits.py @@ -114,8 +114,8 @@ def main(): verify_tree = False no_sha1 = False - os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "0" if no_sha1 else "1" - os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG'] = "1" if current_commit in revsig_allowed else "0" + os.environ['DEFI_VERIFY_COMMITS_ALLOW_SHA1'] = "0" if no_sha1 else "1" + os.environ['DEFI_VERIFY_COMMITS_ALLOW_REVSIG'] = "1" if current_commit in revsig_allowed else "0" # Check that the commit (and parents) was signed with a trusted key if subprocess.call([GIT, '-c', 'gpg.program={}/gpg.sh'.format(dirname), 'verify-commit', current_commit], stdout=subprocess.DEVNULL): diff --git a/contrib/verifybinaries/README.md b/contrib/verifybinaries/README.md index 4209fdb364..b22ce30073 100644 --- a/contrib/verifybinaries/README.md +++ b/contrib/verifybinaries/README.md @@ -5,10 +5,10 @@ Make sure you obtain the proper release signing key and verify the fingerprint with several independent sources. ```sh -$ gpg --fingerprint "Bitcoin Core binary release signing key" +$ gpg --fingerprint "Defi Core binary release signing key" pub 4096R/36C2E964 2015-06-24 [expires: YYYY-MM-DD] Key fingerprint = 01EA 5486 DE18 A882 D4C2 6845 90C8 019E 36C2 E964 -uid Wladimir J. van der Laan (Bitcoin Core binary release signing key) +uid Wladimir J. van der Laan (Defi Core binary release signing key) ``` #### Usage: @@ -21,21 +21,21 @@ The script returns 0 if everything passes the checks. It returns 1 if either the ```sh -./verify.sh bitcoin-core-0.11.2 -./verify.sh bitcoin-core-0.12.0 -./verify.sh bitcoin-core-0.13.0-rc3 +./verify.sh defi-core-0.11.2 +./verify.sh defi-core-0.12.0 +./verify.sh defi-core-0.13.0-rc3 ``` If you only want to download the binaries of certain platform, add the corresponding suffix, e.g.: ```sh -./verify.sh bitcoin-core-0.11.2-osx +./verify.sh defi-core-0.11.2-osx ./verify.sh 0.12.0-linux -./verify.sh bitcoin-core-0.13.0-rc3-win64 +./verify.sh defi-core-0.13.0-rc3-win64 ``` If you do not want to keep the downloaded binaries, specify anything as the second parameter. ```sh -./verify.sh bitcoin-core-0.13.0 delete +./verify.sh defi-core-0.13.0 delete ``` diff --git a/contrib/verifybinaries/verify.sh b/contrib/verifybinaries/verify.sh index bfe74aa4fa..6073edbc19 100755 --- a/contrib/verifybinaries/verify.sh +++ b/contrib/verifybinaries/verify.sh @@ -19,7 +19,7 @@ function clean_up { done } -WORKINGDIR="/tmp/bitcoin_verify_binaries" +WORKINGDIR="/tmp/defi_verify_binaries" TMPFILE="hashes.tmp" SIGNATUREFILENAME="SHA256SUMS.asc" @@ -27,7 +27,7 @@ RCSUBDIR="test" HOST1="https://bitcoincore.org" HOST2="https://bitcoin.org" BASEDIR="/bin/" -VERSIONPREFIX="bitcoin-core-" +VERSIONPREFIX="defi-core-" RCVERSIONSTRING="rc" if [ ! -d "$WORKINGDIR" ]; then @@ -38,7 +38,7 @@ cd "$WORKINGDIR" || exit 1 #test if a version number has been passed as an argument if [ -n "$1" ]; then - #let's also check if the version number includes the prefix 'bitcoin-', + #let's also check if the version number includes the prefix 'defi-', # and add this prefix if it doesn't if [[ $1 == "$VERSIONPREFIX"* ]]; then VERSION="$1" @@ -122,7 +122,7 @@ if [ $RET -ne 0 ]; then echo "Bad signature." elif [ $RET -eq 2 ]; then #or if a gpg error has occurred - echo "gpg error. Do you have the Bitcoin Core binary release signing key installed?" + echo "gpg error. Do you have the Defi Core binary release signing key installed?" fi echo "gpg output:" diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py index 06893407f5..b98dd2f67f 100644 --- a/contrib/zmq/zmq_sub.py +++ b/contrib/zmq/zmq_sub.py @@ -6,8 +6,8 @@ """ ZMQ example using python3's asyncio - Bitcoin should be started with the command line arguments: - bitcoind -testnet -daemon \ + Defi should be started with the command line arguments: + defid -testnet -daemon \ -zmqpubrawtx=tcp://127.0.0.1:28332 \ -zmqpubrawblock=tcp://127.0.0.1:28332 \ -zmqpubhashtx=tcp://127.0.0.1:28332 \ diff --git a/doc/bitcoin-conf.md b/doc/defi-conf.md similarity index 100% rename from doc/bitcoin-conf.md rename to doc/defi-conf.md diff --git a/doc/bitcoin_logo_doxygen.png b/doc/defi_logo_doxygen.png similarity index 100% rename from doc/bitcoin_logo_doxygen.png rename to doc/defi_logo_doxygen.png diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index edbc0911a1..37e80d2991 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,23 +1,23 @@ dist_man1_MANS= -if BUILD_BITCOIND - dist_man1_MANS+=bitcoind.1 +if BUILD_DEFID + dist_man1_MANS+=defid.1 endif if ENABLE_QT - dist_man1_MANS+=bitcoin-qt.1 + dist_man1_MANS+=defi-qt.1 endif -if BUILD_BITCOIN_CLI - dist_man1_MANS+=bitcoin-cli.1 +if BUILD_DEFI_CLI + dist_man1_MANS+=defi-cli.1 endif -if BUILD_BITCOIN_TX - dist_man1_MANS+=bitcoin-tx.1 +if BUILD_DEFI_TX + dist_man1_MANS+=defi-tx.1 endif if ENABLE_WALLET -if BUILD_BITCOIN_WALLET - dist_man1_MANS+=bitcoin-wallet.1 +if BUILD_DEFI_WALLET + dist_man1_MANS+=defi-wallet.1 endif endif diff --git a/doc/man/bitcoin-cli.1 b/doc/man/defi-cli.1 similarity index 85% rename from doc/man/bitcoin-cli.1 rename to doc/man/defi-cli.1 index 95c1d24dff..9e9cdc9f19 100644 --- a/doc/man/bitcoin-cli.1 +++ b/doc/man/defi-cli.1 @@ -1,21 +1,21 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOIN-CLI "1" "February 2019" "bitcoin-cli v0.17.99.0" "User Commands" +.TH DEFI-CLI "1" "February 2019" "defi-cli v0.17.99.0" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v0.17.99.0 +defi-cli \- manual page for defi-cli v0.17.99.0 .SH SYNOPSIS -.B bitcoin-cli -[\fI\,options\/\fR] \fI\, \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR +.B defi-cli +[\fI\,options\/\fR] \fI\, \/\fR[\fI\,params\/\fR] \fI\,Send command to Defi Core\/\fR .br -.B bitcoin-cli -[\fI\,options\/\fR] \fI\,-named \/\fR[\fI\,name=value\/\fR]... \fI\,Send command to Bitcoin Core (with named arguments)\/\fR +.B defi-cli +[\fI\,options\/\fR] \fI\,-named \/\fR[\fI\,name=value\/\fR]... \fI\,Send command to Defi Core (with named arguments)\/\fR .br -.B bitcoin-cli +.B defi-cli [\fI\,options\/\fR] \fI\,help List commands\/\fR .br -.B bitcoin-cli +.B defi-cli [\fI\,options\/\fR] \fI\,help Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v0.17.99.0 +Defi Core RPC client version v0.17.99.0 .SH OPTIONS .HP \-? @@ -25,7 +25,7 @@ Print this help message and exit \fB\-conf=\fR .IP Specify configuration file. Relative paths will be prefixed by datadir -location. (default: bitcoin.conf) +location. (default: defi.conf) .HP \fB\-datadir=\fR .IP @@ -77,7 +77,7 @@ Wait for RPC server to start \fB\-rpcwallet=\fR .IP Send RPC for non\-default wallet on RPC server (needs to exactly match -corresponding \fB\-wallet\fR option passed to bitcoind). This changes +corresponding \fB\-wallet\fR option passed to defid). This changes the RPC endpoint used, e.g. http://127.0.0.1:8332/wallet/ .HP @@ -106,7 +106,7 @@ Use the test chain .SH COPYRIGHT Copyright (C) 2009-2019 The Bitcoin Core developers -Please contribute if you find Bitcoin Core useful. Visit +Please contribute if you find Defi Core useful. Visit for further information about the software. The source code is available from . diff --git a/doc/man/bitcoin-qt.1 b/doc/man/defi-qt.1 similarity index 98% rename from doc/man/bitcoin-qt.1 rename to doc/man/defi-qt.1 index 1e8443b1d3..7bac75da77 100644 --- a/doc/man/bitcoin-qt.1 +++ b/doc/man/defi-qt.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOIN-QT "1" "February 2019" "bitcoin-qt v0.17.99.0" "User Commands" +.TH DEFI-QT "1" "February 2019" "defi-qt v0.17.99.0" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v0.17.99.0 +defi-qt \- manual page for defi-qt v0.17.99.0 .SH SYNOPSIS -.B bitcoin-qt +.B defi-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v0.17.99.0 (64\-bit) +Defi Core version v0.17.99.0 (64\-bit) .SH OPTIONS .HP \-? @@ -44,7 +44,7 @@ Specify blocks directory (default: /blocks) \fB\-conf=\fR .IP Specify configuration file. Relative paths will be prefixed by datadir -location. (default: bitcoin.conf) +location. (default: defi.conf) .HP \fB\-daemon\fR .IP @@ -98,7 +98,7 @@ Whether to save the mempool on shutdown and load on restart (default: 1) \fB\-pid=\fR .IP Specify pid file. Relative paths will be prefixed by a net\-specific -datadir location. (default: bitcoind.pid) +datadir location. (default: defid.pid) .HP \fB\-prune=\fR .IP @@ -605,7 +605,7 @@ Show splash screen on startup (default: 1) .SH COPYRIGHT Copyright (C) 2009-2019 The Bitcoin Core developers -Please contribute if you find Bitcoin Core useful. Visit +Please contribute if you find Defi Core useful. Visit for further information about the software. The source code is available from . diff --git a/doc/man/bitcoin-tx.1 b/doc/man/defi-tx.1 similarity index 88% rename from doc/man/bitcoin-tx.1 rename to doc/man/defi-tx.1 index 6b6071d9b7..bac993451e 100644 --- a/doc/man/bitcoin-tx.1 +++ b/doc/man/defi-tx.1 @@ -1,15 +1,15 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOIN-TX "1" "February 2019" "bitcoin-tx v0.17.99.0" "User Commands" +.TH DEFI-TX "1" "February 2019" "defi-tx v0.17.99.0" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v0.17.99.0 +defi-tx \- manual page for defi-tx v0.17.99.0 .SH SYNOPSIS -.B bitcoin-tx -[\fI\,options\/\fR] \fI\, \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR +.B defi-tx +[\fI\,options\/\fR] \fI\, \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded defi transaction\/\fR .br -.B bitcoin-tx -[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR +.B defi-tx +[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded defi transaction\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-tx utility version v0.17.99.0 +Defi Core defi\-tx utility version v0.17.99.0 .SH OPTIONS .HP \-? @@ -107,7 +107,7 @@ Set register NAME to given JSON\-STRING .SH COPYRIGHT Copyright (C) 2009-2019 The Bitcoin Core developers -Please contribute if you find Bitcoin Core useful. Visit +Please contribute if you find Defi Core useful. Visit for further information about the software. The source code is available from . diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/defi-wallet.1 similarity index 82% rename from doc/man/bitcoin-wallet.1 rename to doc/man/defi-wallet.1 index 1cb8cdebcd..d4818ed893 100644 --- a/doc/man/bitcoin-wallet.1 +++ b/doc/man/defi-wallet.1 @@ -1,16 +1,16 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOIN-WALLET "1" "February 2019" "bitcoin-wallet v0.17.99.0" "User Commands" +.TH DEFI-WALLET "1" "February 2019" "defi-wallet v0.17.99.0" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v0.17.99.0 +defi-wallet \- manual page for defi-wallet v0.17.99.0 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v0.17.99.0 +Defi Core defi\-wallet version v0.17.99.0 .PP -wallet\-tool is an offline tool for creating and interacting with Bitcoin Core wallet files. +wallet\-tool is an offline tool for creating and interacting with Defi Core wallet files. By default wallet\-tool will act on wallets in the default mainnet wallet directory in the datadir. To change the target wallet, use the \fB\-datadir\fR, \fB\-wallet\fR and \fB\-testnet\fR/\-regtest arguments. .SS "Usage:" .IP -bitcoin\-wallet [options] +defi\-wallet [options] .SH OPTIONS .HP \-? @@ -54,7 +54,7 @@ Get wallet info .SH COPYRIGHT Copyright (C) 2009-2019 The Bitcoin Core developers -Please contribute if you find Bitcoin Core useful. Visit +Please contribute if you find Defi Core useful. Visit for further information about the software. The source code is available from . diff --git a/doc/man/bitcoind.1 b/doc/man/defid.1 similarity index 97% rename from doc/man/bitcoind.1 rename to doc/man/defid.1 index 2a79b6cb46..6d3e884846 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/defid.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOIND "1" "February 2019" "bitcoind v0.17.99.0" "User Commands" +.TH DEFID "1" "February 2019" "defid v0.17.99.0" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v0.17.99.0 +defid \- manual page for defid v0.17.99.0 .SH SYNOPSIS -.B bitcoind -[\fI\,options\/\fR] \fI\,Start Bitcoin Core Daemon\/\fR +.B defid +[\fI\,options\/\fR] \fI\,Start Defi Core Daemon\/\fR .SH DESCRIPTION -Bitcoin Core Daemon version v0.17.99.0 +Defi Core Daemon version v0.17.99.0 .SH OPTIONS .HP \-? @@ -44,7 +44,7 @@ Specify blocks directory (default: /blocks) \fB\-conf=\fR .IP Specify configuration file. Relative paths will be prefixed by datadir -location. (default: bitcoin.conf) +location. (default: defi.conf) .HP \fB\-daemon\fR .IP @@ -98,7 +98,7 @@ Whether to save the mempool on shutdown and load on restart (default: 1) \fB\-pid=\fR .IP Specify pid file. Relative paths will be prefixed by a net\-specific -datadir location. (default: bitcoind.pid) +datadir location. (default: defid.pid) .HP \fB\-prune=\fR .IP @@ -578,7 +578,7 @@ Accept command line and JSON\-RPC commands .SH COPYRIGHT Copyright (C) 2009-2019 The Bitcoin Core developers -Please contribute if you find Bitcoin Core useful. Visit +Please contribute if you find Defi Core useful. Visit for further information about the software. The source code is available from . diff --git a/libbitcoinconsensus.pc.in b/libdeficonsensus.pc.in similarity index 68% rename from libbitcoinconsensus.pc.in rename to libdeficonsensus.pc.in index eb920c47eb..d2b133b7ac 100644 --- a/libbitcoinconsensus.pc.in +++ b/libdeficonsensus.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: @PACKAGE_NAME@ consensus library -Description: Library for the Bitcoin consensus protocol. +Description: Library for the Defi consensus protocol. Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lbitcoinconsensus +Libs: -L${libdir} -ldeficonsensus Cflags: -I${includedir} Requires.private: libcrypto diff --git a/masternodes.md b/masternodes.md new file mode 100644 index 0000000000..a947727749 --- /dev/null +++ b/masternodes.md @@ -0,0 +1,59 @@ +Masternodes short manual +----------------- +To start minting, user should become a "masternode" by sending special transaction, which locks collateral and burns an announcement fee. After got banned or resigning, announcement fee isn't refunded (only masternode collateral is refunded). + +#### Masternode roles +There are two distinct roles: 'masternode owner' and 'masternode operator'. The only ability for owner is to resign masternode (and reclaiming collateral after that). Owner holds the collateral. +The primary activity (minting new coins, voting for anchors) is performed by operator. In general, node hoster can play both. + +#### For owners who operate their masternodes +In this case, operator's address is equal to owner's (collateral) address. +1. Announce masternode with your collateral address. You should keep control of that address (have a private key) or you'll loose your collateral. THE OPERATION WILL BURN ANNOUNCEMENT FEE! Don't do it if you're not sure that the address is correct. +``` +defi-cli createmasternode \{\"collateralAddress\":\"YOUR_ADDRESS\"\} +``` +The transaction will be funded automatically by any accessible coins in your wallet (the same way as 'fundrawtransaction' acts). Or you can specify custom UTXOs for that (run ```defi-cli help createmasternode```). +The result is the transaction hash being created that acts as masternode's ID. When this transaction gets into mempool (and then, in chain), your collateral will be locked until resigning or ban. Don't be afraid if you can't see it in UTXO lists/wallet - it wasn't lost, just hidden. +2. Place your addresses in config file: +``` +masternode_owner=YOUR_ADDRESS +masternode_operator=YOUR_ADDRESS +``` +3. Restart the node. After tx got into blockchain, you can see the result of masternode's creation by issuing +``` +defi-cli listmasternodes +``` +4. If you decide to resign your masternode, issue +``` +defi-cli resignmasternode +``` +Important: you should keep small amount of coins on a collateral address in different from collateral's UTXO due to this transaction will be authorized by matching collateral (owner) address and should be funded (at least by one TxOut) from that UTXO! Funding will be performed automatically (as in 'createmasternode') or you can specify custom UTXO (as in case with 'createmasternode', see rpc's help). + +#### For owners who outsource operation +The same as in previous scenario, but the 'operator' should provide you his address before masternode creation: +1. Announce masternode as before, but specify both: operator's address and YOUR collateral address. +``` +defi-cli createmasternode \{\"operatorAuthAddress\":\"OPERATOR_ADDRESS\",\"collateralAddress\":\"YOUR_ADDRESS\"\} +``` +2. Operator places ```masternode_operator=OPERATOR_ADDRESS``` +in his config file, and you place ```masternode_owner=YOUR_ADDRESS``` in your own. +3. Operator runs your masternode. Owner has no need to keep his node running until he decide to resign it. + +#### Masternode's states and delays +Sending `createmasternode` (or 'resignmasternode') transaction doesn't mean that it acts immidiately after getting in blockchain. There are special delays for each state. All delays will be adjusted before final network deploy. +Masternode can exists in those states: +``` + PRE_ENABLED, + ENABLED, + PRE_RESIGNED, + RESIGNED, + PRE_BANNED, + BANNED +``` +- `PRE_ENABLED` - masternode was created, but waits for enough blocks after creation to get activated. +- `ENABLED` - masternode is in fully operable state, can mint blocks and sign anchors +- `PRE_RESIGNED` - masternode is still operable, but got a 'resign' transaction and waits for special delay to get resigned +- `RESIGNED` - masternode resigned, collateral unlocked and can be reclaimed +- `PRE_BANNED` - masternode was caught as 'criminal' (signing two blocks from parrallel forks on close heights and we got special proofing tx on chain) but still operable (waiting, as in the case of PRE_RESIGNED) +- `BANNED` - masternode deactivated, collateral unlocked and can be reclaimed (same as RESIGNED, but by another reason of deactivation) + diff --git a/share/examples/bitcoin.conf b/share/examples/defi.conf similarity index 100% rename from share/examples/bitcoin.conf rename to share/examples/defi.conf diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/defi.ico similarity index 100% rename from share/pixmaps/bitcoin.ico rename to share/pixmaps/defi.ico diff --git a/share/pixmaps/bitcoin128.png b/share/pixmaps/defi128.png similarity index 100% rename from share/pixmaps/bitcoin128.png rename to share/pixmaps/defi128.png diff --git a/share/pixmaps/bitcoin128.xpm b/share/pixmaps/defi128.xpm similarity index 100% rename from share/pixmaps/bitcoin128.xpm rename to share/pixmaps/defi128.xpm diff --git a/share/pixmaps/bitcoin16.png b/share/pixmaps/defi16.png similarity index 100% rename from share/pixmaps/bitcoin16.png rename to share/pixmaps/defi16.png diff --git a/share/pixmaps/bitcoin16.xpm b/share/pixmaps/defi16.xpm similarity index 100% rename from share/pixmaps/bitcoin16.xpm rename to share/pixmaps/defi16.xpm diff --git a/share/pixmaps/bitcoin256.png b/share/pixmaps/defi256.png similarity index 100% rename from share/pixmaps/bitcoin256.png rename to share/pixmaps/defi256.png diff --git a/share/pixmaps/bitcoin256.xpm b/share/pixmaps/defi256.xpm similarity index 100% rename from share/pixmaps/bitcoin256.xpm rename to share/pixmaps/defi256.xpm diff --git a/share/pixmaps/bitcoin32.png b/share/pixmaps/defi32.png similarity index 100% rename from share/pixmaps/bitcoin32.png rename to share/pixmaps/defi32.png diff --git a/share/pixmaps/bitcoin32.xpm b/share/pixmaps/defi32.xpm similarity index 100% rename from share/pixmaps/bitcoin32.xpm rename to share/pixmaps/defi32.xpm diff --git a/share/pixmaps/bitcoin64.png b/share/pixmaps/defi64.png similarity index 100% rename from share/pixmaps/bitcoin64.png rename to share/pixmaps/defi64.png diff --git a/share/pixmaps/bitcoin64.xpm b/share/pixmaps/defi64.xpm similarity index 100% rename from share/pixmaps/bitcoin64.xpm rename to share/pixmaps/defi64.xpm diff --git a/src/Makefile.am b/src/Makefile.am index 1451953f3b..07dd5a52db 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,43 +19,50 @@ else LIBUNIVALUE = $(UNIVALUE_LIBS) endif -BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) - -BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include -BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) - -LIBBITCOIN_SERVER=libbitcoin_server.a -LIBBITCOIN_COMMON=libbitcoin_common.a -LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a -LIBBITCOIN_CLI=libbitcoin_cli.a -LIBBITCOIN_UTIL=libbitcoin_util.a -LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.a -LIBBITCOINQT=qt/libbitcoinqt.a +LIBSPV=spv/libspv.a +$(LIBSPV): + $(MAKE) -C spv lib +SPV_CFLAGS=-I. -I./spv -I./spv/support -I./spv/bitcoin -I./spv/bcash +# -I./secp256k1 + +DEFI_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) + +DEFI_INCLUDES += -I$(srcdir)/secp256k1/include +DEFI_INCLUDES += $(UNIVALUE_CFLAGS) +DEFI_INCLUDES += $(SPV_CFLAGS) + +LIBDEFI_SERVER=libdefi_server.a +LIBDEFI_COMMON=libdefi_common.a +LIBDEFI_CONSENSUS=libdefi_consensus.a +LIBDEFI_CLI=libdefi_cli.a +LIBDEFI_UTIL=libdefi_util.a +LIBDEFI_CRYPTO_BASE=crypto/libdefi_crypto_base.a +LIBDEFIQT=qt/libdefiqt.a LIBSECP256K1=secp256k1/libsecp256k1.la if ENABLE_ZMQ -LIBBITCOIN_ZMQ=libbitcoin_zmq.a +LIBDEFI_ZMQ=libdefi_zmq.a endif -if BUILD_BITCOIN_LIBS -LIBBITCOINCONSENSUS=libbitcoinconsensus.la +if BUILD_DEFI_LIBS +LIBDEFICONSENSUS=libdeficonsensus.la endif if ENABLE_WALLET -LIBBITCOIN_WALLET=libbitcoin_wallet.a -LIBBITCOIN_WALLET_TOOL=libbitcoin_wallet_tool.a +LIBDEFI_WALLET=libdefi_wallet.a +LIBDEFI_WALLET_TOOL=libdefi_wallet_tool.a endif -LIBBITCOIN_CRYPTO= $(LIBBITCOIN_CRYPTO_BASE) +LIBDEFI_CRYPTO= $(LIBDEFI_CRYPTO_BASE) if ENABLE_SSE41 -LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.a -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41) +LIBDEFI_CRYPTO_SSE41 = crypto/libdefi_crypto_sse41.a +LIBDEFI_CRYPTO += $(LIBDEFI_CRYPTO_SSE41) endif if ENABLE_AVX2 -LIBBITCOIN_CRYPTO_AVX2 = crypto/libbitcoin_crypto_avx2.a -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_AVX2) +LIBDEFI_CRYPTO_AVX2 = crypto/libdefi_crypto_avx2.a +LIBDEFI_CRYPTO += $(LIBDEFI_CRYPTO_AVX2) endif if ENABLE_SHANI -LIBBITCOIN_CRYPTO_SHANI = crypto/libbitcoin_crypto_shani.a -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SHANI) +LIBDEFI_CRYPTO_SHANI = crypto/libdefi_crypto_shani.a +LIBDEFI_CRYPTO += $(LIBDEFI_CRYPTO_SHANI) endif $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*) @@ -64,42 +71,42 @@ $(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_CRYPTO) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_SERVER) \ - $(LIBBITCOIN_CLI) \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_WALLET_TOOL) \ - $(LIBBITCOIN_ZMQ) - -lib_LTLIBRARIES = $(LIBBITCOINCONSENSUS) + $(LIBDEFI_CRYPTO) \ + $(LIBDEFI_UTIL) \ + $(LIBDEFI_COMMON) \ + $(LIBDEFI_CONSENSUS) \ + $(LIBDEFI_SERVER) \ + $(LIBDEFI_CLI) \ + $(LIBDEFI_WALLET) \ + $(LIBDEFI_WALLET_TOOL) \ + $(LIBDEFI_ZMQ) + +lib_LTLIBRARIES = $(LIBDEFICONSENSUS) bin_PROGRAMS = noinst_PROGRAMS = TESTS = BENCHMARKS = -if BUILD_BITCOIND - bin_PROGRAMS += bitcoind +if BUILD_DEFID + bin_PROGRAMS += defid endif -if BUILD_BITCOIN_CLI - bin_PROGRAMS += bitcoin-cli +if BUILD_DEFI_CLI + bin_PROGRAMS += defi-cli endif -if BUILD_BITCOIN_TX - bin_PROGRAMS += bitcoin-tx +if BUILD_DEFI_TX + bin_PROGRAMS += defi-tx endif if ENABLE_WALLET -if BUILD_BITCOIN_WALLET - bin_PROGRAMS += bitcoin-wallet +if BUILD_DEFI_WALLET + bin_PROGRAMS += defi-wallet endif endif .PHONY: FORCE check-symbols check-security -# bitcoin core # -BITCOIN_CORE_H = \ +# defi core # +DEFI_CORE_H = \ addrdb.h \ addrman.h \ attributes.h \ @@ -146,6 +153,7 @@ BITCOIN_CORE_H = \ dbwrapper.h \ limitedmap.h \ logging.h \ + masternodes/anchors.h \ masternodes/masternodes.h \ masternodes/mn_checks.h \ masternodes/mn_txdb.h \ @@ -193,6 +201,8 @@ BITCOIN_CORE_H = \ script/signingprovider.h \ script/standard.h \ shutdown.h \ + spv/btctransaction.h \ + spv/spv_wrapper.h \ streams.h \ support/allocators/secure.h \ support/allocators/zeroafterfree.h \ @@ -253,15 +263,15 @@ obj/build.h: FORCE @$(MKDIR_P) $(builddir)/obj @$(top_srcdir)/share/genbuild.sh "$(abs_top_builddir)/src/obj/build.h" \ "$(abs_top_srcdir)" -libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h +libdefi_util_a-clientversion.$(OBJEXT): obj/build.h -# server: shared between bitcoind and bitcoin-qt +# server: shared between defid and defi-qt # Contains code accessing mempool and chain state that is meant to be separated # from wallet and gui code (see node/README.md). Shared code should go in -# libbitcoin_common or libbitcoin_util libraries, instead. -libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_server_a_SOURCES = \ +# libdefi_common or libdefi_util libraries, instead. +libdefi_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) +libdefi_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdefi_server_a_SOURCES = \ addrdb.cpp \ addrman.cpp \ banman.cpp \ @@ -279,6 +289,7 @@ libbitcoin_server_a_SOURCES = \ interfaces/node.cpp \ init.cpp \ dbwrapper.cpp \ + masternodes/anchors.cpp \ masternodes/masternodes.cpp \ masternodes/mn_checks.cpp \ masternodes/mn_txdb.cpp \ @@ -305,6 +316,9 @@ libbitcoin_server_a_SOURCES = \ rpc/server.cpp \ script/sigcache.cpp \ shutdown.cpp \ + spv/btctransaction.cpp \ + spv/spv_wrapper.cpp \ + spv/spv_rpc.cpp \ timedata.cpp \ torcontrol.cpp \ txdb.cpp \ @@ -313,19 +327,19 @@ libbitcoin_server_a_SOURCES = \ validation.cpp \ validationinterface.cpp \ versionbits.cpp \ - $(BITCOIN_CORE_H) + $(DEFI_CORE_H) if ENABLE_WALLET -libbitcoin_server_a_SOURCES += wallet/init.cpp +libdefi_server_a_SOURCES += wallet/init.cpp endif if !ENABLE_WALLET -libbitcoin_server_a_SOURCES += dummywallet.cpp +libdefi_server_a_SOURCES += dummywallet.cpp endif if ENABLE_ZMQ -libbitcoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) -libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_zmq_a_SOURCES = \ +libdefi_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(ZMQ_CFLAGS) +libdefi_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdefi_zmq_a_SOURCES = \ zmq/zmqabstractnotifier.cpp \ zmq/zmqnotificationinterface.cpp \ zmq/zmqpublishnotifier.cpp \ @@ -333,11 +347,11 @@ libbitcoin_zmq_a_SOURCES = \ endif -# wallet: shared between bitcoind and bitcoin-qt, but only linked +# wallet: shared between defid and defi-qt, but only linked # when wallet enabled -libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_wallet_a_SOURCES = \ +libdefi_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +libdefi_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdefi_wallet_a_SOURCES = \ interfaces/wallet.cpp \ wallet/coincontrol.cpp \ wallet/crypter.cpp \ @@ -353,18 +367,18 @@ libbitcoin_wallet_a_SOURCES = \ wallet/walletdb.cpp \ wallet/walletutil.cpp \ wallet/coinselection.cpp \ - $(BITCOIN_CORE_H) + $(DEFI_CORE_H) -libbitcoin_wallet_tool_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_wallet_tool_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_wallet_tool_a_SOURCES = \ +libdefi_wallet_tool_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +libdefi_wallet_tool_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdefi_wallet_tool_a_SOURCES = \ wallet/wallettool.cpp \ - $(BITCOIN_CORE_H) + $(DEFI_CORE_H) # crypto primitives library -crypto_libbitcoin_crypto_base_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_base_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libbitcoin_crypto_base_a_SOURCES = \ +crypto_libdefi_crypto_base_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libdefi_crypto_base_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libdefi_crypto_base_a_SOURCES = \ crypto/aes.cpp \ crypto/aes.h \ crypto/chacha_poly_aead.h \ @@ -392,31 +406,31 @@ crypto_libbitcoin_crypto_base_a_SOURCES = \ crypto/siphash.h if USE_ASM -crypto_libbitcoin_crypto_base_a_SOURCES += crypto/sha256_sse4.cpp +crypto_libdefi_crypto_base_a_SOURCES += crypto/sha256_sse4.cpp endif -crypto_libbitcoin_crypto_sse41_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libbitcoin_crypto_sse41_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_sse41_a_CXXFLAGS += $(SSE41_CXXFLAGS) -crypto_libbitcoin_crypto_sse41_a_CPPFLAGS += -DENABLE_SSE41 -crypto_libbitcoin_crypto_sse41_a_SOURCES = crypto/sha256_sse41.cpp +crypto_libdefi_crypto_sse41_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libdefi_crypto_sse41_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libdefi_crypto_sse41_a_CXXFLAGS += $(SSE41_CXXFLAGS) +crypto_libdefi_crypto_sse41_a_CPPFLAGS += -DENABLE_SSE41 +crypto_libdefi_crypto_sse41_a_SOURCES = crypto/sha256_sse41.cpp -crypto_libbitcoin_crypto_avx2_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libbitcoin_crypto_avx2_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_avx2_a_CXXFLAGS += $(AVX2_CXXFLAGS) -crypto_libbitcoin_crypto_avx2_a_CPPFLAGS += -DENABLE_AVX2 -crypto_libbitcoin_crypto_avx2_a_SOURCES = crypto/sha256_avx2.cpp +crypto_libdefi_crypto_avx2_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libdefi_crypto_avx2_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libdefi_crypto_avx2_a_CXXFLAGS += $(AVX2_CXXFLAGS) +crypto_libdefi_crypto_avx2_a_CPPFLAGS += -DENABLE_AVX2 +crypto_libdefi_crypto_avx2_a_SOURCES = crypto/sha256_avx2.cpp -crypto_libbitcoin_crypto_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libbitcoin_crypto_shani_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_shani_a_CXXFLAGS += $(SHANI_CXXFLAGS) -crypto_libbitcoin_crypto_shani_a_CPPFLAGS += -DENABLE_SHANI -crypto_libbitcoin_crypto_shani_a_SOURCES = crypto/sha256_shani.cpp +crypto_libdefi_crypto_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libdefi_crypto_shani_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libdefi_crypto_shani_a_CXXFLAGS += $(SHANI_CXXFLAGS) +crypto_libdefi_crypto_shani_a_CPPFLAGS += -DENABLE_SHANI +crypto_libdefi_crypto_shani_a_SOURCES = crypto/sha256_shani.cpp # consensus: shared between all executables that validate any consensus rules. -libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_consensus_a_SOURCES = \ +libdefi_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +libdefi_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdefi_consensus_a_SOURCES = \ amount.h \ arith_uint256.cpp \ arith_uint256.h \ @@ -434,7 +448,7 @@ libbitcoin_consensus_a_SOURCES = \ primitives/transaction.h \ pubkey.cpp \ pubkey.h \ - script/bitcoinconsensus.cpp \ + script/deficonsensus.cpp \ script/interpreter.cpp \ script/interpreter.h \ script/script.cpp \ @@ -450,10 +464,10 @@ libbitcoin_consensus_a_SOURCES = \ util/strencodings.h \ version.h -# common: shared between bitcoind, and bitcoin-qt and non-server tools -libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_common_a_SOURCES = \ +# common: shared between defid, and defi-qt and non-server tools +libdefi_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +libdefi_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdefi_common_a_SOURCES = \ base58.cpp \ bech32.cpp \ bloom.cpp \ @@ -482,14 +496,14 @@ libbitcoin_common_a_SOURCES = \ script/standard.cpp \ versionbitsinfo.cpp \ warnings.cpp \ - $(BITCOIN_CORE_H) + $(DEFI_CORE_H) # util: shared between all executables. # This library *must* be included to make sure that the glibc # backward-compatibility objects and their sanity checks are linked. -libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_util_a_SOURCES = \ +libdefi_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +libdefi_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdefi_util_a_SOURCES = \ support/lockedpool.cpp \ chainparamsbase.cpp \ clientversion.cpp \ @@ -517,132 +531,134 @@ libbitcoin_util_a_SOURCES = \ util/time.cpp \ util/url.cpp \ util/validation.cpp \ - $(BITCOIN_CORE_H) + $(DEFI_CORE_H) if GLIBC_BACK_COMPAT -libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp +libdefi_util_a_SOURCES += compat/glibc_compat.cpp AM_LDFLAGS += $(COMPAT_LDFLAGS) endif -# cli: shared between bitcoin-cli and bitcoin-qt -libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_cli_a_SOURCES = \ +# cli: shared between defi-cli and defi-qt +libdefi_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +libdefi_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdefi_cli_a_SOURCES = \ rpc/client.cpp \ - $(BITCOIN_CORE_H) + $(DEFI_CORE_H) -nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h +nodist_libdefi_util_a_SOURCES = $(srcdir)/obj/build.h # -# bitcoind binary # -bitcoind_SOURCES = bitcoind.cpp -bitcoind_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoind_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# defid binary # +defid_SOURCES = defid.cpp +defid_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +defid_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +defid_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoind_SOURCES += bitcoind-res.rc +defid_SOURCES += defid-res.rc endif # Libraries below may be listed more than once to resolve circular dependencies (see # https://eli.thegreenplace.net/2013/07/09/library-order-in-static-linking#circular-dependency) -bitcoind_LDADD = \ - $(LIBBITCOIN_SERVER) \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_SERVER) \ - $(LIBBITCOIN_COMMON) \ +defid_LDADD = \ + $(LIBDEFI_SERVER) \ + $(LIBDEFI_WALLET) \ + $(LIBDEFI_SERVER) \ + $(LIBDEFI_COMMON) \ $(LIBUNIVALUE) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_ZMQ) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ + $(LIBSPV) \ + $(LIBDEFI_UTIL) \ + $(LIBDEFI_ZMQ) \ + $(LIBDEFI_CONSENSUS) \ + $(LIBDEFI_CRYPTO) \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) \ $(LIBSECP256K1) -bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) +defid_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) -# bitcoin-cli binary # -bitcoin_cli_SOURCES = bitcoin-cli.cpp -bitcoin_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) -bitcoin_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# defi-cli binary # +defi_cli_SOURCES = defi-cli.cpp +defi_cli_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(EVENT_CFLAGS) +defi_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +defi_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_cli_SOURCES += bitcoin-cli-res.rc +defi_cli_SOURCES += defi-cli-res.rc endif -bitcoin_cli_LDADD = \ - $(LIBBITCOIN_CLI) \ +defi_cli_LDADD = \ + $(LIBDEFI_CLI) \ $(LIBUNIVALUE) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CRYPTO) + $(LIBDEFI_UTIL) \ + $(LIBDEFI_CRYPTO) -bitcoin_cli_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) +defi_cli_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) # -# bitcoin-tx binary # -bitcoin_tx_SOURCES = bitcoin-tx.cpp -bitcoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoin_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# defi-tx binary # +defi_tx_SOURCES = defi-tx.cpp +defi_tx_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +defi_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +defi_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_tx_SOURCES += bitcoin-tx-res.rc +defi_tx_SOURCES += defi-tx-res.rc endif -bitcoin_tx_LDADD = \ +defi_tx_LDADD = \ $(LIBUNIVALUE) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ + $(LIBDEFI_COMMON) \ + $(LIBDEFI_UTIL) \ + $(LIBDEFI_CONSENSUS) \ + $(LIBDEFI_CRYPTO) \ $(LIBSECP256K1) -bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) +defi_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) # -# bitcoin-wallet binary # -bitcoin_wallet_SOURCES = bitcoin-wallet.cpp -bitcoin_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoin_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# defi-wallet binary # +defi_wallet_SOURCES = defi-wallet.cpp +defi_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) +defi_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +defi_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_wallet_SOURCES += bitcoin-wallet-res.rc +defi_wallet_SOURCES += defi-wallet-res.rc endif -bitcoin_wallet_LDADD = \ - $(LIBBITCOIN_WALLET_TOOL) \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CRYPTO) \ - $(LIBBITCOIN_ZMQ) \ +defi_wallet_LDADD = \ + $(LIBDEFI_WALLET_TOOL) \ + $(LIBDEFI_WALLET) \ + $(LIBDEFI_COMMON) \ + $(LIBDEFI_CONSENSUS) \ + $(LIBSPV) \ + $(LIBDEFI_UTIL) \ + $(LIBDEFI_CRYPTO) \ + $(LIBDEFI_ZMQ) \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) \ $(LIBSECP256K1) \ $(LIBUNIVALUE) -bitcoin_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS) $(ZMQ_LIBS) +defi_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS) $(ZMQ_LIBS) # -# bitcoinconsensus library # -if BUILD_BITCOIN_LIBS -include_HEADERS = script/bitcoinconsensus.h -libbitcoinconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) +# deficonsensus library # +if BUILD_DEFI_LIBS +include_HEADERS = script/deficonsensus.h +libdeficonsensus_la_SOURCES = support/cleanse.cpp $(crypto_libdefi_crypto_base_a_SOURCES) $(libdefi_consensus_a_SOURCES) if GLIBC_BACK_COMPAT - libbitcoinconsensus_la_SOURCES += compat/glibc_compat.cpp + libdeficonsensus_la_SOURCES += compat/glibc_compat.cpp endif -libbitcoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) -libbitcoinconsensus_la_LIBADD = $(LIBSECP256K1) -libbitcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL -libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libdeficonsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) +libdeficonsensus_la_LIBADD = $(LIBSECP256K1) +libdeficonsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_DEFI_INTERNAL +libdeficonsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) endif # @@ -672,16 +688,17 @@ CLEANFILES += obj/build.h EXTRA_DIST = $(CTAES_DIST) -config/bitcoin-config.h: config/stamp-h1 +config/defi-config.h: config/stamp-h1 @$(MAKE) -C $(top_builddir) $(subdir)/$(@) -config/stamp-h1: $(top_srcdir)/$(subdir)/config/bitcoin-config.h.in $(top_builddir)/config.status +config/stamp-h1: $(top_srcdir)/$(subdir)/config/defi-config.h.in $(top_builddir)/config.status $(AM_V_at)$(MAKE) -C $(top_builddir) $(subdir)/$(@) -$(top_srcdir)/$(subdir)/config/bitcoin-config.h.in: $(am__configure_deps) - $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/bitcoin-config.h.in +$(top_srcdir)/$(subdir)/config/defi-config.h.in: $(am__configure_deps) + $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/defi-config.h.in clean-local: -$(MAKE) -C secp256k1 clean -$(MAKE) -C univalue clean + -$(MAKE) -C spv clean -rm -f leveldb/*/*.gcda leveldb/*/*.gcno leveldb/helpers/memenv/*.gcda leveldb/helpers/memenv/*.gcno -rm -f config.h -rm -rf test/__pycache__ diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index e369a4614d..c94aabffaa 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -2,17 +2,17 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -bin_PROGRAMS += bench/bench_bitcoin +bin_PROGRAMS += bench/bench_defi BENCH_SRCDIR = bench -BENCH_BINARY = bench/bench_bitcoin$(EXEEXT) +BENCH_BINARY = bench/bench_defi$(EXEEXT) RAW_BENCH_FILES = \ bench/data/block413567.raw GENERATED_BENCH_FILES = $(RAW_BENCH_FILES:.raw=.raw.h) -bench_bench_bitcoin_SOURCES = \ +bench_bench_defi_SOURCES = \ $(RAW_BENCH_FILES) \ - bench/bench_bitcoin.cpp \ + bench/bench_defi.cpp \ bench/bench.cpp \ bench/bench.h \ bench/block_assemble.cpp \ @@ -44,19 +44,20 @@ bench_bench_bitcoin_SOURCES = \ test/util.h \ test/util.cpp -nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES) +nodist_bench_bench_defi_SOURCES = $(GENERATED_BENCH_FILES) -bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ -bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bench_bench_bitcoin_LDADD = \ - $(LIBBITCOIN_MN) \ - $(LIBBITCOIN_SERVER) \ - $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_SERVER) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ +bench_bench_defi_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ +bench_bench_defi_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +bench_bench_defi_LDADD = \ + $(LIBDEFI_MN) \ + $(LIBDEFI_SERVER) \ + $(LIBDEFI_WALLET) \ + $(LIBDEFI_SERVER) \ + $(LIBDEFI_COMMON) \ + $(LIBDEFI_UTIL) \ + $(LIBDEFI_CONSENSUS) \ + $(LIBDEFI_CRYPTO) \ + $(LIBSPV) \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) \ @@ -66,30 +67,30 @@ bench_bench_bitcoin_LDADD = \ $(EVENT_LIBS) if ENABLE_ZMQ -bench_bench_bitcoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +bench_bench_defi_LDADD += $(LIBDEFI_ZMQ) $(ZMQ_LIBS) endif if ENABLE_WALLET -bench_bench_bitcoin_SOURCES += bench/coin_selection.cpp -bench_bench_bitcoin_SOURCES += bench/wallet_balance.cpp +bench_bench_defi_SOURCES += bench/coin_selection.cpp +bench_bench_defi_SOURCES += bench/wallet_balance.cpp endif -bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS) -bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +bench_bench_defi_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS) +bench_bench_defi_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_BENCH_FILES) +CLEAN_DEFI_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_BENCH_FILES) -CLEANFILES += $(CLEAN_BITCOIN_BENCH) +CLEANFILES += $(CLEAN_DEFI_BENCH) bench/data.cpp: bench/data/block413567.raw.h -bitcoin_bench: $(BENCH_BINARY) +defi_bench: $(BENCH_BINARY) bench: $(BENCH_BINARY) FORCE $(BENCH_BINARY) -bitcoin_bench_clean : FORCE - rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_bitcoin_OBJECTS) $(BENCH_BINARY) +defi_bench_clean : FORCE + rm -f $(CLEAN_DEFI_BENCH) $(bench_bench_defi_OBJECTS) $(BENCH_BINARY) %.raw.h: %.raw @$(MKDIR_P) $(@D) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 6d8faf3883..feaa14d433 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -2,97 +2,97 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -bin_PROGRAMS += qt/bitcoin-qt -EXTRA_LIBRARIES += qt/libbitcoinqt.a +bin_PROGRAMS += qt/defi-qt +EXTRA_LIBRARIES += qt/libdefiqt.a -# bitcoin qt core # +# defi qt core # QT_TS = \ - qt/locale/bitcoin_af.ts \ - qt/locale/bitcoin_af_ZA.ts \ - qt/locale/bitcoin_ar.ts \ - qt/locale/bitcoin_be_BY.ts \ - qt/locale/bitcoin_bg_BG.ts \ - qt/locale/bitcoin_bg.ts \ - qt/locale/bitcoin_ca_ES.ts \ - qt/locale/bitcoin_ca.ts \ - qt/locale/bitcoin_ca@valencia.ts \ - qt/locale/bitcoin_cs.ts \ - qt/locale/bitcoin_cy.ts \ - qt/locale/bitcoin_da.ts \ - qt/locale/bitcoin_de.ts \ - qt/locale/bitcoin_el_GR.ts \ - qt/locale/bitcoin_el.ts \ - qt/locale/bitcoin_en_GB.ts \ - qt/locale/bitcoin_en.ts \ - qt/locale/bitcoin_eo.ts \ - qt/locale/bitcoin_es_AR.ts \ - qt/locale/bitcoin_es_CL.ts \ - qt/locale/bitcoin_es_CO.ts \ - qt/locale/bitcoin_es_DO.ts \ - qt/locale/bitcoin_es_ES.ts \ - qt/locale/bitcoin_es_MX.ts \ - qt/locale/bitcoin_es.ts \ - qt/locale/bitcoin_es_UY.ts \ - qt/locale/bitcoin_es_VE.ts \ - qt/locale/bitcoin_et_EE.ts \ - qt/locale/bitcoin_et.ts \ - qt/locale/bitcoin_eu_ES.ts \ - qt/locale/bitcoin_fa_IR.ts \ - qt/locale/bitcoin_fa.ts \ - qt/locale/bitcoin_fi.ts \ - qt/locale/bitcoin_fr_CA.ts \ - qt/locale/bitcoin_fr_FR.ts \ - qt/locale/bitcoin_fr.ts \ - qt/locale/bitcoin_gl.ts \ - qt/locale/bitcoin_he.ts \ - qt/locale/bitcoin_hi_IN.ts \ - qt/locale/bitcoin_hr.ts \ - qt/locale/bitcoin_hu.ts \ - qt/locale/bitcoin_id_ID.ts \ - qt/locale/bitcoin_it_IT.ts \ - qt/locale/bitcoin_it.ts \ - qt/locale/bitcoin_ja.ts \ - qt/locale/bitcoin_ka.ts \ - qt/locale/bitcoin_kk_KZ.ts \ - qt/locale/bitcoin_ko_KR.ts \ - qt/locale/bitcoin_ku_IQ.ts \ - qt/locale/bitcoin_ky.ts \ - qt/locale/bitcoin_la.ts \ - qt/locale/bitcoin_lt.ts \ - qt/locale/bitcoin_lv_LV.ts \ - qt/locale/bitcoin_mk_MK.ts \ - qt/locale/bitcoin_mn.ts \ - qt/locale/bitcoin_ms_MY.ts \ - qt/locale/bitcoin_nb.ts \ - qt/locale/bitcoin_ne.ts \ - qt/locale/bitcoin_nl.ts \ - qt/locale/bitcoin_pam.ts \ - qt/locale/bitcoin_pl.ts \ - qt/locale/bitcoin_pt_BR.ts \ - qt/locale/bitcoin_pt_PT.ts \ - qt/locale/bitcoin_ro_RO.ts \ - qt/locale/bitcoin_ro.ts \ - qt/locale/bitcoin_ru_RU.ts \ - qt/locale/bitcoin_ru.ts \ - qt/locale/bitcoin_sk.ts \ - qt/locale/bitcoin_sl_SI.ts \ - qt/locale/bitcoin_sq.ts \ - qt/locale/bitcoin_sr@latin.ts \ - qt/locale/bitcoin_sr.ts \ - qt/locale/bitcoin_sv.ts \ - qt/locale/bitcoin_ta.ts \ - qt/locale/bitcoin_th_TH.ts \ - qt/locale/bitcoin_tr_TR.ts \ - qt/locale/bitcoin_tr.ts \ - qt/locale/bitcoin_uk.ts \ - qt/locale/bitcoin_ur_PK.ts \ - qt/locale/bitcoin_uz@Cyrl.ts \ - qt/locale/bitcoin_vi.ts \ - qt/locale/bitcoin_vi_VN.ts \ - qt/locale/bitcoin_zh_CN.ts \ - qt/locale/bitcoin_zh_HK.ts \ - qt/locale/bitcoin_zh.ts \ - qt/locale/bitcoin_zh_TW.ts + qt/locale/defi_af.ts \ + qt/locale/defi_af_ZA.ts \ + qt/locale/defi_ar.ts \ + qt/locale/defi_be_BY.ts \ + qt/locale/defi_bg_BG.ts \ + qt/locale/defi_bg.ts \ + qt/locale/defi_ca_ES.ts \ + qt/locale/defi_ca.ts \ + qt/locale/defi_ca@valencia.ts \ + qt/locale/defi_cs.ts \ + qt/locale/defi_cy.ts \ + qt/locale/defi_da.ts \ + qt/locale/defi_de.ts \ + qt/locale/defi_el_GR.ts \ + qt/locale/defi_el.ts \ + qt/locale/defi_en_GB.ts \ + qt/locale/defi_en.ts \ + qt/locale/defi_eo.ts \ + qt/locale/defi_es_AR.ts \ + qt/locale/defi_es_CL.ts \ + qt/locale/defi_es_CO.ts \ + qt/locale/defi_es_DO.ts \ + qt/locale/defi_es_ES.ts \ + qt/locale/defi_es_MX.ts \ + qt/locale/defi_es.ts \ + qt/locale/defi_es_UY.ts \ + qt/locale/defi_es_VE.ts \ + qt/locale/defi_et_EE.ts \ + qt/locale/defi_et.ts \ + qt/locale/defi_eu_ES.ts \ + qt/locale/defi_fa_IR.ts \ + qt/locale/defi_fa.ts \ + qt/locale/defi_fi.ts \ + qt/locale/defi_fr_CA.ts \ + qt/locale/defi_fr_FR.ts \ + qt/locale/defi_fr.ts \ + qt/locale/defi_gl.ts \ + qt/locale/defi_he.ts \ + qt/locale/defi_hi_IN.ts \ + qt/locale/defi_hr.ts \ + qt/locale/defi_hu.ts \ + qt/locale/defi_id_ID.ts \ + qt/locale/defi_it_IT.ts \ + qt/locale/defi_it.ts \ + qt/locale/defi_ja.ts \ + qt/locale/defi_ka.ts \ + qt/locale/defi_kk_KZ.ts \ + qt/locale/defi_ko_KR.ts \ + qt/locale/defi_ku_IQ.ts \ + qt/locale/defi_ky.ts \ + qt/locale/defi_la.ts \ + qt/locale/defi_lt.ts \ + qt/locale/defi_lv_LV.ts \ + qt/locale/defi_mk_MK.ts \ + qt/locale/defi_mn.ts \ + qt/locale/defi_ms_MY.ts \ + qt/locale/defi_nb.ts \ + qt/locale/defi_ne.ts \ + qt/locale/defi_nl.ts \ + qt/locale/defi_pam.ts \ + qt/locale/defi_pl.ts \ + qt/locale/defi_pt_BR.ts \ + qt/locale/defi_pt_PT.ts \ + qt/locale/defi_ro_RO.ts \ + qt/locale/defi_ro.ts \ + qt/locale/defi_ru_RU.ts \ + qt/locale/defi_ru.ts \ + qt/locale/defi_sk.ts \ + qt/locale/defi_sl_SI.ts \ + qt/locale/defi_sq.ts \ + qt/locale/defi_sr@latin.ts \ + qt/locale/defi_sr.ts \ + qt/locale/defi_sv.ts \ + qt/locale/defi_ta.ts \ + qt/locale/defi_th_TH.ts \ + qt/locale/defi_tr_TR.ts \ + qt/locale/defi_tr.ts \ + qt/locale/defi_uk.ts \ + qt/locale/defi_ur_PK.ts \ + qt/locale/defi_uz@Cyrl.ts \ + qt/locale/defi_vi.ts \ + qt/locale/defi_vi_VN.ts \ + qt/locale/defi_zh_CN.ts \ + qt/locale/defi_zh_HK.ts \ + qt/locale/defi_zh.ts \ + qt/locale/defi_zh_TW.ts QT_FORMS_UI = \ qt/forms/addressbookpage.ui \ @@ -118,11 +118,11 @@ QT_MOC_CPP = \ qt/moc_addresstablemodel.cpp \ qt/moc_askpassphrasedialog.cpp \ qt/moc_bantablemodel.cpp \ - qt/moc_bitcoinaddressvalidator.cpp \ - qt/moc_bitcoinamountfield.cpp \ - qt/moc_bitcoin.cpp \ - qt/moc_bitcoingui.cpp \ - qt/moc_bitcoinunits.cpp \ + qt/moc_defiaddressvalidator.cpp \ + qt/moc_defiamountfield.cpp \ + qt/moc_defi.cpp \ + qt/moc_defigui.cpp \ + qt/moc_defiunits.cpp \ qt/moc_clientmodel.cpp \ qt/moc_coincontroldialog.cpp \ qt/moc_coincontroltreewidget.cpp \ @@ -163,21 +163,21 @@ QT_MOC_CPP = \ qt/moc_walletmodel.cpp \ qt/moc_walletview.cpp -BITCOIN_MM = \ +DEFI_MM = \ qt/macdockiconhandler.mm \ qt/macnotificationhandler.mm \ qt/macos_appnap.mm QT_MOC = \ - qt/bitcoinamountfield.moc \ + qt/defiamountfield.moc \ qt/intro.moc \ qt/overviewpage.moc \ qt/rpcconsole.moc -QT_QRC_CPP = qt/qrc_bitcoin.cpp -QT_QRC = qt/bitcoin.qrc -QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp -QT_QRC_LOCALE = qt/bitcoin_locale.qrc +QT_QRC_CPP = qt/qrc_defi.cpp +QT_QRC = qt/defi.qrc +QT_QRC_LOCALE_CPP = qt/qrc_defi_locale.cpp +QT_QRC_LOCALE = qt/defi_locale.qrc if ENABLE_BIP70 PROTOBUF_CC = qt/paymentrequest.pb.cc @@ -189,16 +189,16 @@ PROTOBUF_H = PROTOBUF_PROTO = endif -BITCOIN_QT_H = \ +DEFI_QT_H = \ qt/addressbookpage.h \ qt/addresstablemodel.h \ qt/askpassphrasedialog.h \ qt/bantablemodel.h \ - qt/bitcoinaddressvalidator.h \ - qt/bitcoinamountfield.h \ - qt/bitcoin.h \ - qt/bitcoingui.h \ - qt/bitcoinunits.h \ + qt/defiaddressvalidator.h \ + qt/defiamountfield.h \ + qt/defi.h \ + qt/defigui.h \ + qt/defiunits.h \ qt/clientmodel.h \ qt/coincontroldialog.h \ qt/coincontroltreewidget.h \ @@ -250,9 +250,9 @@ BITCOIN_QT_H = \ RES_ICONS = \ qt/res/icons/add.png \ qt/res/icons/address-book.png \ - qt/res/icons/bitcoin.ico \ - qt/res/icons/bitcoin_testnet.ico \ - qt/res/icons/bitcoin.png \ + qt/res/icons/defi.ico \ + qt/res/icons/defi_testnet.ico \ + qt/res/icons/defi.png \ qt/res/icons/chevron.png \ qt/res/icons/clock1.png \ qt/res/icons/clock2.png \ @@ -295,13 +295,13 @@ RES_ICONS = \ qt/res/icons/tx_mined.png \ qt/res/icons/warning.png -BITCOIN_QT_BASE_CPP = \ +DEFI_QT_BASE_CPP = \ qt/bantablemodel.cpp \ - qt/bitcoin.cpp \ - qt/bitcoinaddressvalidator.cpp \ - qt/bitcoinamountfield.cpp \ - qt/bitcoingui.cpp \ - qt/bitcoinunits.cpp \ + qt/defi.cpp \ + qt/defiaddressvalidator.cpp \ + qt/defiamountfield.cpp \ + qt/defigui.cpp \ + qt/defiunits.cpp \ qt/clientmodel.cpp \ qt/csvmodelwriter.cpp \ qt/guiutil.cpp \ @@ -320,9 +320,9 @@ BITCOIN_QT_BASE_CPP = \ qt/trafficgraphwidget.cpp \ qt/utilitydialog.cpp -BITCOIN_QT_WINDOWS_CPP = qt/winshutdownmonitor.cpp +DEFI_QT_WINDOWS_CPP = qt/winshutdownmonitor.cpp -BITCOIN_QT_WALLET_CPP = \ +DEFI_QT_WALLET_CPP = \ qt/addressbookpage.cpp \ qt/addresstablemodel.cpp \ qt/askpassphrasedialog.cpp \ @@ -351,17 +351,17 @@ BITCOIN_QT_WALLET_CPP = \ qt/walletmodeltransaction.cpp \ qt/walletview.cpp -BITCOIN_QT_WALLET_BIP70_CPP = \ +DEFI_QT_WALLET_BIP70_CPP = \ qt/paymentrequestplus.cpp -BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP) +DEFI_QT_CPP = $(DEFI_QT_BASE_CPP) if TARGET_WINDOWS -BITCOIN_QT_CPP += $(BITCOIN_QT_WINDOWS_CPP) +DEFI_QT_CPP += $(DEFI_QT_WINDOWS_CPP) endif if ENABLE_WALLET -BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP) +DEFI_QT_CPP += $(DEFI_QT_WALLET_CPP) if ENABLE_BIP70 -BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_BIP70_CPP) +DEFI_QT_CPP += $(DEFI_QT_WALLET_BIP70_CPP) endif # ENABLE_BIP70 endif # ENABLE_WALLET @@ -369,22 +369,22 @@ RES_IMAGES = RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png) -BITCOIN_RC = qt/res/bitcoin-qt-res.rc +DEFI_RC = qt/res/defi-qt-res.rc -BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS +DEFI_QT_INCLUDES = -DQT_NO_KEYWORDS -qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_libdefiqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(DEFI_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS) +qt_libdefiqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_libdefiqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS) -qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ +qt_libdefiqt_a_SOURCES = $(DEFI_QT_CPP) $(DEFI_QT_H) $(QT_FORMS_UI) \ $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) if TARGET_DARWIN - qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM) + qt_libdefiqt_a_SOURCES += $(DEFI_MM) endif -nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \ +nodist_qt_libdefiqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \ $(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP) # forms/foo.h -> forms/ui_foo.h @@ -393,76 +393,76 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI: # Most files will depend on the forms and moc files as includes. Generate them # before anything else. $(QT_MOC): $(QT_FORMS_H) -$(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) : | $(QT_MOC) +$(qt_libdefiqt_a_OBJECTS) $(qt_defi_qt_OBJECTS) : | $(QT_MOC) #Generating these with a half-written protobuf header leads to wacky results. #This makes sure it's done. $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) -# bitcoin-qt binary # -qt_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +# defi-qt binary # +qt_defi_qt_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(DEFI_QT_INCLUDES) \ $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_bitcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_defi_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -qt_bitcoin_qt_SOURCES = qt/main.cpp +qt_defi_qt_SOURCES = qt/main.cpp if TARGET_WINDOWS - qt_bitcoin_qt_SOURCES += $(BITCOIN_RC) + qt_defi_qt_SOURCES += $(DEFI_RC) endif -qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) +qt_defi_qt_LDADD = qt/libdefiqt.a $(LIBDEFI_SERVER) if ENABLE_WALLET -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) +qt_defi_qt_LDADD += $(LIBDEFI_UTIL) $(LIBDEFI_WALLET) endif if ENABLE_ZMQ -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +qt_defi_qt_LDADD += $(LIBDEFI_ZMQ) $(ZMQ_LIBS) endif -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \ +qt_defi_qt_LDADD += $(LIBDEFI_CLI) $(LIBDEFI_COMMON) $(LIBDEFI_UTIL) $(LIBDEFI_CONSENSUS) $(LIBDEFI_CRYPTO) $(LIBUNIVALUE) $(LIBSPV) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) if ENABLE_BIP70 -qt_bitcoin_qt_LDADD += $(SSL_LIBS) +qt_defi_qt_LDADD += $(SSL_LIBS) else if TARGET_WINDOWS -qt_bitcoin_qt_LDADD += $(SSL_LIBS) +qt_defi_qt_LDADD += $(SSL_LIBS) endif endif -qt_bitcoin_qt_LDADD += $(CRYPTO_LIBS) -qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_bitcoin_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX +qt_defi_qt_LDADD += $(CRYPTO_LIBS) +qt_defi_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_defi_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) SECONDARY: $(QT_QM) -$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES) +$(srcdir)/qt/defistrings.cpp: $(libdefi_server_a_SOURCES) $(libdefi_wallet_a_SOURCES) $(libdefi_common_a_SOURCES) $(libdefi_zmq_a_SOURCES) $(libdefi_consensus_a_SOURCES) $(libdefi_util_a_SOURCES) @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" $(PYTHON) ../share/qt/extract_strings_qt.py $^ -translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/bitcoin.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) +translate: $(srcdir)/qt/defistrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(DEFI_QT_BASE_CPP) qt/defi.cpp $(DEFI_QT_WINDOWS_CPP) $(DEFI_QT_WALLET_CPP) $(DEFI_QT_H) $(DEFI_MM) @test -n $(LUPDATE) || echo "lupdate is required for updating translations" - $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/bitcoin_en.ts + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/defi_en.ts $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM) @test -f $(RCC) @cp -f $< $(@D)/temp_$( $@ @rm $(@D)/temp_$( $@ -CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc +CLEAN_QT = $(nodist_qt_libdefiqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_defi_locale.qrc CLEANFILES += $(CLEAN_QT) -bitcoin_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) qt/bitcoin-qt$(EXEEXT) $(LIBBITCOINQT) +defi_qt_clean: FORCE + rm -f $(CLEAN_QT) $(qt_libdefiqt_a_OBJECTS) $(qt_defi_qt_OBJECTS) qt/defi-qt$(EXEEXT) $(LIBDEFIQT) -bitcoin_qt : qt/bitcoin-qt$(EXEEXT) +defi_qt : qt/defi-qt$(EXEEXT) ui_%.h: %.ui @test -f $(UIC) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 4acfff809e..4fd7f12f69 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -2,8 +2,8 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -bin_PROGRAMS += qt/test/test_bitcoin-qt -TESTS += qt/test/test_bitcoin-qt +bin_PROGRAMS += qt/test/test_defi-qt +TESTS += qt/test/test_defi-qt TEST_QT_MOC_CPP = \ qt/test/moc_apptests.cpp \ @@ -32,16 +32,16 @@ TEST_QT_H = \ qt/test/paymentservertests.h \ qt/test/wallettests.h -TEST_BITCOIN_CPP = \ +TEST_DEFI_CPP = \ test/setup_common.cpp -TEST_BITCOIN_H = \ +TEST_DEFI_H = \ test/setup_common.h -qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_test_test_defi_qt_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(DEFI_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) -qt_test_test_bitcoin_qt_SOURCES = \ +qt_test_test_defi_qt_SOURCES = \ qt/test/apptests.cpp \ qt/test/compattests.cpp \ qt/test/rpcnestedtests.cpp \ @@ -49,43 +49,43 @@ qt_test_test_bitcoin_qt_SOURCES = \ qt/test/uritests.cpp \ qt/test/util.cpp \ $(TEST_QT_H) \ - $(TEST_BITCOIN_CPP) \ - $(TEST_BITCOIN_H) + $(TEST_DEFI_CPP) \ + $(TEST_DEFI_H) if ENABLE_WALLET -qt_test_test_bitcoin_qt_SOURCES += \ +qt_test_test_defi_qt_SOURCES += \ qt/test/addressbooktests.cpp \ qt/test/wallettests.cpp \ wallet/test/wallet_test_fixture.cpp if ENABLE_BIP70 -qt_test_test_bitcoin_qt_SOURCES += \ +qt_test_test_defi_qt_SOURCES += \ qt/test/paymentservertests.cpp endif # ENABLE_BIP70 endif # ENABLE_WALLET -nodist_qt_test_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP) +nodist_qt_test_test_defi_qt_SOURCES = $(TEST_QT_MOC_CPP) -qt_test_test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) +qt_test_test_defi_qt_LDADD = $(LIBDEFIQT) $(LIBDEFI_SERVER) if ENABLE_WALLET -qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) +qt_test_test_defi_qt_LDADD += $(LIBDEFI_UTIL) $(LIBDEFI_WALLET) endif if ENABLE_ZMQ -qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +qt_test_test_defi_qt_LDADD += $(LIBDEFI_ZMQ) $(ZMQ_LIBS) endif -qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \ +qt_test_test_defi_qt_LDADD += $(LIBDEFI_CLI) $(LIBDEFI_COMMON) $(LIBDEFI_UTIL) $(LIBDEFI_CONSENSUS) $(LIBDEFI_CRYPTO) $(LIBUNIVALUE) $(LIBSPV) $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) -qt_test_test_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_test_test_bitcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_test_test_defi_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_test_test_defi_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno +CLEAN_DEFI_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno -CLEANFILES += $(CLEAN_BITCOIN_QT_TEST) +CLEANFILES += $(CLEAN_DEFI_QT_TEST) -test_bitcoin_qt : qt/test/test_bitcoin-qt$(EXEEXT) +test_defi_qt : qt/test/test_defi-qt$(EXEEXT) -test_bitcoin_qt_check : qt/test/test_bitcoin-qt$(EXEEXT) FORCE +test_defi_qt_check : qt/test/test_defi-qt$(EXEEXT) FORCE $(MAKE) check-TESTS TESTS=$^ -test_bitcoin_qt_clean: FORCE - rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_bitcoin_qt_OBJECTS) +test_defi_qt_clean: FORCE + rm -f $(CLEAN_DEFI_QT_TEST) $(qt_test_test_defi_qt_OBJECTS) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 10477fb3f9..96e220b19c 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -29,11 +29,11 @@ FUZZ_TARGETS = \ if ENABLE_FUZZ noinst_PROGRAMS += $(FUZZ_TARGETS:=) else -bin_PROGRAMS += test/test_bitcoin +bin_PROGRAMS += test/test_defi endif TEST_SRCDIR = test -TEST_BINARY=test/test_bitcoin$(EXEEXT) +TEST_BINARY=test/test_defi$(EXEEXT) JSON_TEST_FILES = \ test/data/script_tests.json \ @@ -50,7 +50,7 @@ RAW_TEST_FILES = GENERATED_TEST_FILES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h) -BITCOIN_TEST_SUITE = \ +DEFI_TEST_SUITE = \ test/main.cpp \ test/setup_common.h \ test/setup_common.cpp @@ -62,12 +62,13 @@ FUZZ_SUITE = \ test/fuzz/fuzz.h FUZZ_SUITE_LD_COMMON = \ - $(LIBBITCOIN_SERVER) \ - $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UTIL) \ - $(LIBBITCOIN_CONSENSUS) \ - $(LIBBITCOIN_CRYPTO) \ + $(LIBDEFI_SERVER) \ + $(LIBDEFI_COMMON) \ + $(LIBDEFI_UTIL) \ + $(LIBDEFI_CONSENSUS) \ + $(LIBDEFI_CRYPTO) \ $(LIBUNIVALUE) \ + $(LIBSPV) \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(BOOST_LIBS) \ @@ -77,13 +78,14 @@ FUZZ_SUITE_LD_COMMON = \ $(CRYPTO_LIBS) \ $(EVENT_PTHREADS_LIBS) -# test_bitcoin binary # -BITCOIN_TESTS =\ +# test_defi binary # +DEFI_TESTS =\ test/arith_uint256_tests.cpp \ test/scriptnum10.h \ test/addrman_tests.cpp \ test/amount_tests.cpp \ test/allocator_tests.cpp \ + test/anchor_tests.cpp \ test/base32_tests.cpp \ test/base58_tests.cpp \ test/base64_tests.cpp \ @@ -154,16 +156,16 @@ BITCOIN_TESTS =\ test/versionbits_tests.cpp if ENABLE_PROPERTY_TESTS -BITCOIN_TESTS += \ +DEFI_TESTS += \ test/key_properties.cpp -BITCOIN_TEST_SUITE += \ +DEFI_TEST_SUITE += \ test/gen/crypto_gen.cpp \ test/gen/crypto_gen.h endif if ENABLE_WALLET -BITCOIN_TESTS += \ +DEFI_TESTS += \ wallet/test/db_tests.cpp \ wallet/test/psbt_wallet_tests.cpp \ wallet/test/wallet_tests.cpp \ @@ -172,194 +174,194 @@ BITCOIN_TESTS += \ wallet/test/init_tests.cpp \ wallet/test/ismine_tests.cpp -BITCOIN_TEST_SUITE += \ +DEFI_TEST_SUITE += \ wallet/test/wallet_test_fixture.cpp \ wallet/test/wallet_test_fixture.h \ wallet/test/init_test_fixture.cpp \ wallet/test/init_test_fixture.h endif -test_test_bitcoin_SOURCES = $(BITCOIN_TEST_SUITE) $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) -test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(TESTDEFS) $(EVENT_CFLAGS) -test_test_bitcoin_LDADD = +test_test_defi_SOURCES = $(DEFI_TEST_SUITE) $(DEFI_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) +test_test_defi_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(TESTDEFS) $(EVENT_CFLAGS) +test_test_defi_LDADD = if ENABLE_WALLET -test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET) +test_test_defi_LDADD += $(LIBDEFI_WALLET) endif -test_test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \ - $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) -test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +test_test_defi_LDADD += $(LIBDEFI_SERVER) $(LIBDEFI_CLI) $(LIBDEFI_COMMON) $(LIBDEFI_UTIL) $(LIBDEFI_CONSENSUS) $(LIBDEFI_CRYPTO) $(LIBUNIVALUE) \ + $(LIBSPV) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) +test_test_defi_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -test_test_bitcoin_LDADD += $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(RAPIDCHECK_LIBS) -test_test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static +test_test_defi_LDADD += $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(RAPIDCHECK_LIBS) +test_test_defi_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static if ENABLE_ZMQ -test_test_bitcoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +test_test_defi_LDADD += $(LIBDEFI_ZMQ) $(ZMQ_LIBS) endif if ENABLE_FUZZ test_fuzz_block_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_block_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBLOCK_DESERIALIZE=1 +test_fuzz_block_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBLOCK_DESERIALIZE=1 test_fuzz_block_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_block_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_block_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_transaction_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_transaction_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DTRANSACTION_DESERIALIZE=1 +test_fuzz_transaction_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DTRANSACTION_DESERIALIZE=1 test_fuzz_transaction_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_transaction_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_transaction_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_blocklocator_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_blocklocator_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBLOCKLOCATOR_DESERIALIZE=1 +test_fuzz_blocklocator_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBLOCKLOCATOR_DESERIALIZE=1 test_fuzz_blocklocator_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_blocklocator_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_blocklocator_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_blockmerkleroot_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_blockmerkleroot_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBLOCKMERKLEROOT=1 +test_fuzz_blockmerkleroot_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBLOCKMERKLEROOT=1 test_fuzz_blockmerkleroot_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_blockmerkleroot_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_blockmerkleroot_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_addrman_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_addrman_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DADDRMAN_DESERIALIZE=1 +test_fuzz_addrman_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DADDRMAN_DESERIALIZE=1 test_fuzz_addrman_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_addrman_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_addrman_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_blockheader_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_blockheader_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBLOCKHEADER_DESERIALIZE=1 +test_fuzz_blockheader_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBLOCKHEADER_DESERIALIZE=1 test_fuzz_blockheader_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_blockheader_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_blockheader_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_banentry_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_banentry_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBANENTRY_DESERIALIZE=1 +test_fuzz_banentry_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBANENTRY_DESERIALIZE=1 test_fuzz_banentry_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_banentry_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_banentry_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_txundo_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_txundo_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DTXUNDO_DESERIALIZE=1 +test_fuzz_txundo_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DTXUNDO_DESERIALIZE=1 test_fuzz_txundo_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_txundo_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_txundo_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_blockundo_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_blockundo_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBLOCKUNDO_DESERIALIZE=1 +test_fuzz_blockundo_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBLOCKUNDO_DESERIALIZE=1 test_fuzz_blockundo_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_blockundo_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_blockundo_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_coins_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_coins_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DCOINS_DESERIALIZE=1 +test_fuzz_coins_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DCOINS_DESERIALIZE=1 test_fuzz_coins_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_coins_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_coins_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_netaddr_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_netaddr_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DNETADDR_DESERIALIZE=1 +test_fuzz_netaddr_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DNETADDR_DESERIALIZE=1 test_fuzz_netaddr_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_netaddr_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_netaddr_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_script_flags_SOURCES = $(FUZZ_SUITE) test/fuzz/script_flags.cpp -test_fuzz_script_flags_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +test_fuzz_script_flags_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) test_fuzz_script_flags_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_script_flags_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_script_flags_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_service_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_service_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DSERVICE_DESERIALIZE=1 +test_fuzz_service_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DSERVICE_DESERIALIZE=1 test_fuzz_service_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_service_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_service_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_messageheader_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_messageheader_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DMESSAGEHEADER_DESERIALIZE=1 +test_fuzz_messageheader_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DMESSAGEHEADER_DESERIALIZE=1 test_fuzz_messageheader_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_messageheader_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_messageheader_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_address_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_address_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DADDRESS_DESERIALIZE=1 +test_fuzz_address_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DADDRESS_DESERIALIZE=1 test_fuzz_address_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_address_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_address_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_inv_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_inv_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DINV_DESERIALIZE=1 +test_fuzz_inv_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DINV_DESERIALIZE=1 test_fuzz_inv_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_inv_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_inv_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_bloomfilter_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_bloomfilter_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBLOOMFILTER_DESERIALIZE=1 +test_fuzz_bloomfilter_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBLOOMFILTER_DESERIALIZE=1 test_fuzz_bloomfilter_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_bloomfilter_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_bloomfilter_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_diskblockindex_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_diskblockindex_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DDISKBLOCKINDEX_DESERIALIZE=1 +test_fuzz_diskblockindex_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DDISKBLOCKINDEX_DESERIALIZE=1 test_fuzz_diskblockindex_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_diskblockindex_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_diskblockindex_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_txoutcompressor_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_txoutcompressor_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DTXOUTCOMPRESSOR_DESERIALIZE=1 +test_fuzz_txoutcompressor_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DTXOUTCOMPRESSOR_DESERIALIZE=1 test_fuzz_txoutcompressor_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_txoutcompressor_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_txoutcompressor_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_blocktransactions_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_blocktransactions_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBLOCKTRANSACTIONS_DESERIALIZE=1 +test_fuzz_blocktransactions_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBLOCKTRANSACTIONS_DESERIALIZE=1 test_fuzz_blocktransactions_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_blocktransactions_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_blocktransactions_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_blocktransactionsrequest_deserialize_SOURCES = $(FUZZ_SUITE) test/fuzz/deserialize.cpp -test_fuzz_blocktransactionsrequest_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -DBLOCKTRANSACTIONSREQUEST_DESERIALIZE=1 +test_fuzz_blocktransactionsrequest_deserialize_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) -DBLOCKTRANSACTIONSREQUEST_DESERIALIZE=1 test_fuzz_blocktransactionsrequest_deserialize_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_blocktransactionsrequest_deserialize_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) test_fuzz_blocktransactionsrequest_deserialize_LDADD = $(FUZZ_SUITE_LD_COMMON) endif # ENABLE_FUZZ -nodist_test_test_bitcoin_SOURCES = $(GENERATED_TEST_FILES) +nodist_test_test_defi_SOURCES = $(GENERATED_TEST_FILES) -$(BITCOIN_TESTS): $(GENERATED_TEST_FILES) +$(DEFI_TESTS): $(GENERATED_TEST_FILES) -CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES) $(BITCOIN_TESTS:=.log) +CLEAN_DEFI_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES) $(DEFI_TESTS:=.log) -CLEANFILES += $(CLEAN_BITCOIN_TEST) +CLEANFILES += $(CLEAN_DEFI_TEST) if TARGET_WINDOWS -bitcoin_test: $(TEST_BINARY) +defi_test: $(TEST_BINARY) else if ENABLE_BENCH -bitcoin_test: $(TEST_BINARY) $(BENCH_BINARY) +defi_test: $(TEST_BINARY) $(BENCH_BINARY) else -bitcoin_test: $(TEST_BINARY) +defi_test: $(TEST_BINARY) endif endif -bitcoin_test_check: $(TEST_BINARY) FORCE +defi_test_check: $(TEST_BINARY) FORCE $(MAKE) check-TESTS TESTS=$^ -bitcoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) +defi_test_clean : FORCE + rm -f $(CLEAN_DEFI_TEST) $(test_test_defi_OBJECTS) $(TEST_BINARY) -check-local: $(BITCOIN_TESTS:.cpp=.cpp.test) -if BUILD_BITCOIN_TX - @echo "Running test/util/bitcoin-util-test.py..." - $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py +check-local: $(DEFI_TESTS:.cpp=.cpp.test) +if BUILD_DEFI_TX + @echo "Running test/util/defi-util-test.py..." + $(PYTHON) $(top_builddir)/test/util/defi-util-test.py endif @echo "Running test/util/rpcauth-test.py..." $(PYTHON) $(top_builddir)/test/util/rpcauth-test.py if TARGET_WINDOWS else if ENABLE_BENCH - @echo "Running bench/bench_bitcoin -evals=1 -scaling=0..." + @echo "Running bench/bench_defi -evals=1 -scaling=0..." $(BENCH_BINARY) -evals=1 -scaling=0 > /dev/null endif endif diff --git a/src/addrdb.h b/src/addrdb.h index 290b63dd12..b27b3b1e96 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 DEFI_ADDRDB_H +#define DEFI_ADDRDB_H #include #include @@ -104,4 +104,4 @@ class CBanDB bool Read(banmap_t& banSet); }; -#endif // BITCOIN_ADDRDB_H +#endif // DEFI_ADDRDB_H diff --git a/src/addrman.h b/src/addrman.h index e54184ce35..38f34ca6aa 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 DEFI_ADDRMAN_H +#define DEFI_ADDRMAN_H #include #include @@ -623,4 +623,4 @@ class CAddrMan }; -#endif // BITCOIN_ADDRMAN_H +#endif // DEFI_ADDRMAN_H diff --git a/src/amount.h b/src/amount.h index ebf05afa88..f0965137df 100644 --- a/src/amount.h +++ b/src/amount.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_AMOUNT_H -#define BITCOIN_AMOUNT_H +#ifndef DEFI_AMOUNT_H +#define DEFI_AMOUNT_H #include @@ -15,7 +15,7 @@ static const CAmount COIN = 100000000; /** No amount larger than this (in satoshi) is valid. * - * Note that this constant is *not* the total money supply, which in Bitcoin + * Note that this constant is *not* the total money supply, which in Defi * currently happens to be less than 21,000,000 DFI 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 @@ -25,4 +25,4 @@ static const CAmount COIN = 100000000; static const CAmount MAX_MONEY = 21000000 * 4 * COIN; inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } -#endif // BITCOIN_AMOUNT_H +#endif // DEFI_AMOUNT_H diff --git a/src/arith_uint256.h b/src/arith_uint256.h index bd0360087d..caebcb8dc1 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 DEFI_ARITH_UINT256_H +#define DEFI_ARITH_UINT256_H #include #include @@ -271,7 +271,7 @@ class arith_uint256 : public base_uint<256> { * Thus 0x1234560000 is compact (0x05123456) * and 0xc0de000000 is compact (0x0600c0de) * - * Bitcoin only uses this "compact" format for encoding difficulty + * Defi only uses this "compact" format for encoding difficulty * targets, which are unsigned 256bit quantities. Thus, all the * complexities of the sign bit and using base 256 are probably an * implementation accident. @@ -286,4 +286,4 @@ class arith_uint256 : public base_uint<256> { uint256 ArithToUint256(const arith_uint256 &); arith_uint256 UintToArith256(const uint256 &); -#endif // BITCOIN_ARITH_UINT256_H +#endif // DEFI_ARITH_UINT256_H diff --git a/src/attributes.h b/src/attributes.h index 45099bd8b8..e7ab15e259 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 DEFI_ATTRIBUTES_H +#define DEFI_ATTRIBUTES_H #if defined(__has_cpp_attribute) # if __has_cpp_attribute(nodiscard) @@ -19,4 +19,4 @@ # endif #endif -#endif // BITCOIN_ATTRIBUTES_H +#endif // DEFI_ATTRIBUTES_H diff --git a/src/banman.h b/src/banman.h index a1a00309dd..502baf04b5 100644 --- a/src/banman.h +++ b/src/banman.h @@ -2,8 +2,8 @@ // Copyright (c) 2009-2017 The Bitcoin 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 DEFI_BANMAN_H +#define DEFI_BANMAN_H #include #include diff --git a/src/base58.h b/src/base58.h index d6e0299a1e..50d43b1513 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 DEFI_BASE58_H +#define DEFI_BASE58_H #include @@ -60,4 +60,4 @@ NODISCARD bool DecodeBase58Check(const char* psz, std::vector& vc */ NODISCARD bool DecodeBase58Check(const std::string& str, std::vector& vchRet); -#endif // BITCOIN_BASE58_H +#endif // DEFI_BASE58_H diff --git a/src/bech32.h b/src/bech32.h index 2e2823e974..3c37a01d9b 100644 --- a/src/bech32.h +++ b/src/bech32.h @@ -9,8 +9,8 @@ // // For more information, see BIP 173. -#ifndef BITCOIN_BECH32_H -#define BITCOIN_BECH32_H +#ifndef DEFI_BECH32_H +#define DEFI_BECH32_H #include #include @@ -27,4 +27,4 @@ std::pair> Decode(const std::string& str); } // namespace bech32 -#endif // BITCOIN_BECH32_H +#endif // DEFI_BECH32_H diff --git a/src/bench/.gitignore b/src/bench/.gitignore index e231fe4cab..ff67213cb4 100644 --- a/src/bench/.gitignore +++ b/src/bench/.gitignore @@ -1 +1 @@ -bench_bitcoin +bench_defi diff --git a/src/bench/bench.h b/src/bench/bench.h index 35eeab3393..e414b06ef2 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 DEFI_BENCH_BENCH_H +#define DEFI_BENCH_BENCH_H #include #include @@ -139,4 +139,4 @@ class PlotlyPrinter : public Printer #define BENCHMARK(n, num_iters_for_one_second) \ benchmark::BenchRunner BOOST_PP_CAT(bench_, BOOST_PP_CAT(__LINE__, n))(BOOST_PP_STRINGIZE(n), n, (num_iters_for_one_second)); -#endif // BITCOIN_BENCH_BENCH_H +#endif // DEFI_BENCH_BENCH_H diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_defi.cpp similarity index 100% rename from src/bench/bench_bitcoin.cpp rename to src/bench/bench_defi.cpp diff --git a/src/bench/data.h b/src/bench/data.h index 5f13d766ea..e0b0da39d5 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 DEFI_BENCH_DATA_H +#define DEFI_BENCH_DATA_H #include #include @@ -16,4 +16,4 @@ extern const std::vector block413567; } // namespace data } // namespace benchmark -#endif // BITCOIN_BENCH_DATA_H +#endif // DEFI_BENCH_DATA_H diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp index 4891c57b3a..fe5f66d0d9 100644 --- a/src/bench/verify_script.cpp +++ b/src/bench/verify_script.cpp @@ -5,7 +5,7 @@ #include #include #if defined(HAVE_CONSENSUS_LIB) -#include