diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56521a5f7..15f6b4982 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ -Contributing to Bitcoin Core +Contributing to Merit Core ============================ -The Bitcoin Core project operates an open contributor model where anyone is +The Merit 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. @@ -57,12 +57,12 @@ the pull request affects. Valid areas as: - *Consensus* for changes to consensus critical code - *Docs* for changes to the documentation - - *Qt* for changes to bitcoin-qt + - *Qt* for changes to merit-qt - *Mining* for changes to the mining code - *Net* or *P2P* for changes to the peer-to-peer network code - *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs - *Scripts and tools* for changes to the scripts and tools - - *Tests* for changes to the bitcoin unit tests or QA tests + - *Tests* for changes to the merit unit tests or QA tests - *Trivial* should **only** be used for PRs that do not change generated executable code. Notably, refactors (change of function arguments and code reorganization) and changes in behavior should **not** be marked as trivial. @@ -82,7 +82,7 @@ Examples: Trivial: Fix typo in init.cpp Note that translations should not be submitted as pull requests, please see -[Translation Process](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md) +[Translation Process](https://github.com/merit/merit/blob/master/doc/translation_process.md) for more information on helping with translations. If a pull request is specifically not to be considered for merging (yet) please @@ -161,11 +161,11 @@ where possible keep them short, uncomplex and easy to verify. "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 Merit Core project (and related +projects such as libsecp256k1), and is not to be confused with overall Merit 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 Merit 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 @@ -183,7 +183,7 @@ In general, all pull requests must: - Where bugs are fixed, where possible, there should be unit tests demonstrating the bug and also proving the fix. This helps prevent regression. -Patches that change Bitcoin consensus rules are considerably more involved than +Patches that change Merit 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 @@ -224,7 +224,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 Merit 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. @@ -264,7 +264,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 Merit Core release. Copyright --------- diff --git a/INSTALL.md b/INSTALL.md index 520a47d96..ffff342ac 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,5 +1,5 @@ -Building Bitcoin +Building Merit ================ See doc/build-*.md for instructions on building the various -elements of the Bitcoin Core reference implementation of Bitcoin. +elements of the Merit Core reference implementation of Merit. diff --git a/Makefile.am b/Makefile.am index 8216b7d60..6818b3cde 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,20 +12,20 @@ endif GZIP_ENV="-9n" export PYTHONPATH -if BUILD_BITCOIN_LIBS +if BUILD_MERIT_LIBS pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libbitcoinconsensus.pc +pkgconfig_DATA = libmeritconsensus.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_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) +MERITD_BIN=$(top_builddir)/src/$(MERIT_DAEMON_NAME)$(EXEEXT) +MERIT_QT_BIN=$(top_builddir)/src/qt/$(MERIT_GUI_NAME)$(EXEEXT) +MERIT_CLI_BIN=$(top_builddir)/src/$(MERIT_CLI_NAME)$(EXEEXT) +MERIT_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) empty := space := $(empty) $(empty) -OSX_APP=Bitcoin-Qt.app +OSX_APP=Merit-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG=background.svg @@ -34,21 +34,21 @@ 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/merit.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/merit-cli.bash-completion \ + $(top_srcdir)/contrib/merit-tx.bash-completion \ + $(top_srcdir)/contrib/meritd.bash-completion \ $(top_srcdir)/contrib/init \ $(top_srcdir)/contrib/rpm 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/merit.ico \ $(top_srcdir)/share/pixmaps/nsis-header.bmp \ $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \ $(top_srcdir)/doc/README_windows.txt @@ -60,18 +60,18 @@ 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_merit_filtered.info total_coverage.info \ baseline_filtered.info functional_test.info functional_test_filtered.info \ - test_bitcoin_coverage.info test_bitcoin.info + test_merit_coverage.info test_merit.info dist-hook: -$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf - -$(BITCOIN_WIN_INSTALLER): all-recursive +$(MERIT_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) $(MERITD_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(MERIT_QT_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(MERIT_CLI_BIN) $(top_builddir)/release @test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \ echo error: could not build $@ @echo built $@ @@ -88,11 +88,11 @@ $(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/merit.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN) +$(OSX_APP)/Contents/MacOS/Merit-Qt: $(MERIT_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ @@ -101,8 +101,8 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: 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/merit.icns $(OSX_APP)/Contents/Info.plist \ + $(OSX_APP)/Contents/MacOS/Merit-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings osx_volname: echo $(OSX_VOLNAME) >$@ @@ -127,7 +127,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/Merit-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 @@ -142,7 +142,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/Merit-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) @@ -153,16 +153,16 @@ appbundle: $(OSX_APP_BUILT) deploy: $(OSX_DMG) endif if TARGET_WINDOWS -deploy: $(BITCOIN_WIN_INSTALLER) +deploy: $(MERIT_WIN_INSTALLER) endif -$(BITCOIN_QT_BIN): FORCE +$(MERIT_QT_BIN): FORCE $(MAKE) -C src qt/$(@F) -$(BITCOIND_BIN): FORCE +$(MERITD_BIN): FORCE $(MAKE) -C src $(@F) -$(BITCOIN_CLI_BIN): FORCE +$(MERIT_CLI_BIN): FORCE $(MAKE) -C src $(@F) if USE_LCOV @@ -175,16 +175,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_merit.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_merit -o $@ $(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src -test_bitcoin_filtered.info: test_bitcoin.info +test_merit_filtered.info: test_merit.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_merit_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 @@ -193,13 +193,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_merit_coverage.info: baseline_filtered.info test_merit_filtered.info + $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_merit_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_merit_filtered.info functional_test_filtered.info + $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_merit_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_merit.coverage/.dirstamp: test_merit_coverage.info $(GENHTML) -s $(LCOV_OPTS) $< -o $(@D) @touch $@ @@ -207,7 +207,7 @@ total.coverage/.dirstamp: total_coverage.info $(GENHTML) -s $(LCOV_OPTS) $< -o $(@D) @touch $@ -cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp +cov: test_merit.coverage/.dirstamp total.coverage/.dirstamp endif @@ -216,8 +216,8 @@ dist_noinst_SCRIPTS = autogen.sh EXTRA_DIST = $(top_srcdir)/share/genbuild.sh test/functional/test_runner.py test/functional $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS) EXTRA_DIST += \ - test/util/bitcoin-util-test.py \ - test/util/data/bitcoin-util-test.json \ + test/util/merit-util-test.py \ + test/util/data/merit-util-test.json \ test/util/data/blanktxv1.hex \ test/util/data/blanktxv1.json \ test/util/data/blanktxv2.hex \ @@ -267,12 +267,12 @@ EXTRA_DIST += \ test/util/data/txcreatesignv1.json \ test/util/data/txcreatesignv2.hex -CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) +CLEANFILES = $(OSX_DMG) $(MERIT_WIN_INSTALLER) .INTERMEDIATE: $(COVERAGE_INFO) DISTCHECK_CONFIGURE_FLAGS = --enable-man clean-local: - rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) + rm -rf coverage_percent.txt test_merit.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) rm -rf test/functional/__pycache__ diff --git a/README.md b/README.md index ca2470d3b..af0504822 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,6 @@ with no central authority: managing transactions and issuing money are carried out collectively by the network. Merit 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 Merit Core software, see https://Merit.org/en/download, or read the -[original whitepaper](https://Meritcore.org/Merit.pdf). - License ------- @@ -25,11 +21,11 @@ information or see https://opensource.org/licenses/MIT. TestNet ------------------- -You should create a long RPCpassword as instructed here: https://github.com/bitcoin/bitcoin/blob/master/doc/build-osx.md#running +You should create a long RPCpassword as instructed here: https://github.com/merit/merit/blob/master/doc/build-osx.md#running -You will want a bitcoin.conf that looks like: +You will want a merit.conf that looks like: ``` -rpcuser=bitcoinrpc +rpcuser=meritrpc rpcpassword= #--- Network @@ -54,4 +50,4 @@ zmqpubrawtx=tcp://127.0.0.1:28332 zmqpubhashblock=tcp://127.0.0.1:28332 zmqpubrawblock=tcp://127.0.0.1:28332 zmqpubhashtx=tcp://127.0.0.1:28332 -``` \ No newline at end of file +``` diff --git a/build-aux/m4/merit_find_bdb48.m4 b/build-aux/m4/merit_find_bdb48.m4 index b9bf7bf46..2d51e0803 100644 --- a/build-aux/m4/merit_find_bdb48.m4 +++ b/build-aux/m4/merit_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([MERIT_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) + MERIT_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) + MERIT_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx) bdbpath="${bdb48path}" fi else diff --git a/build-aux/m4/merit_qt.m4 b/build-aux/m4/merit_qt.m4 index f83dba076..c3e3213f4 100644 --- a/build-aux/m4/merit_qt.m4 +++ b/build-aux/m4/merit_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 merit_enable_qt to false. Else, exit. +AC_DEFUN([MERIT_QT_FAIL],[ + if test "x$merit_qt_want_version" = "xauto" && test x$merit_qt_force != xyes; then + if test x$merit_enable_qt != xno; then + AC_MSG_WARN([$1; merit-qt frontend will not be built]) fi - bitcoin_enable_qt=no - bitcoin_enable_qt_test=no + merit_enable_qt=no + merit_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([MERIT_QT_CHECK],[ + if test "x$merit_enable_qt" != "xno" && test x$merit_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 MERIT_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([MERIT_QT_PATH_PROGS],[ + MERIT_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]) + MERIT_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 MERIT_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([MERIT_QT_INIT],[ dnl enable qt support AC_ARG_WITH([gui], [AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@], - [build bitcoin-qt GUI (default=auto, qt5 tried first)])], + [build merit-qt GUI (default=auto, qt5 tried first)])], [ - bitcoin_qt_want_version=$withval - if test x$bitcoin_qt_want_version = xyes; then - bitcoin_qt_force=yes - bitcoin_qt_want_version=auto + merit_qt_want_version=$withval + if test x$merit_qt_want_version = xyes; then + merit_qt_force=yes + merit_qt_want_version=auto fi ], - [bitcoin_qt_want_version=auto]) + [merit_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 _MERIT_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: merit_enable_qt, merit_enable_qt_dbus, merit_enable_qt_test +AC_DEFUN([MERIT_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([$2])]) + MERIT_QT_CHECK([_MERIT_QT_FIND_LIBS_WITH_PKGCONFIG([$2])]) else - BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG]) + MERIT_QT_CHECK([_MERIT_QT_FIND_LIBS_WITHOUT_PKGCONFIG]) fi dnl This is ugly and complicated. Yuck. Works as follows: @@ -106,48 +106,48 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ dnl Qt4 and Qt5. With Qt5, languages moved into core and the WindowsIntegration dnl plugin was added. Since we can't tell if Qt4 is static or not, it is dnl assumed for windows builds. - dnl _BITCOIN_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the + dnl _MERIT_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the dnl results to QT_LIBS. - BITCOIN_QT_CHECK([ + MERIT_QT_CHECK([ TEMP_CPPFLAGS=$CPPFLAGS TEMP_CXXFLAGS=$CXXFLAGS CPPFLAGS="$QT_INCLUDES $CPPFLAGS" CXXFLAGS="$PIC_FLAGS $CXXFLAGS" - if test x$bitcoin_qt_got_major_vers = x5; then - _BITCOIN_QT_IS_STATIC - if test x$bitcoin_cv_static_qt = xyes; then - _BITCOIN_QT_FIND_STATIC_PLUGINS + if test x$merit_qt_got_major_vers = x5; then + _MERIT_QT_IS_STATIC + if test x$merit_cv_static_qt = xyes; then + _MERIT_QT_FIND_STATIC_PLUGINS AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) - AC_CACHE_CHECK(for Qt < 5.4, bitcoin_cv_need_acc_widget,[AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + AC_CACHE_CHECK(for Qt < 5.4, merit_cv_need_acc_widget,[AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[#include ]],[[ #if QT_VERSION >= 0x050400 choke; #endif ]])], - [bitcoin_cv_need_acc_widget=yes], - [bitcoin_cv_need_acc_widget=no]) + [merit_cv_need_acc_widget=yes], + [merit_cv_need_acc_widget=no]) ]) - if test "x$bitcoin_cv_need_acc_widget" = "xyes"; then - _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets]) + if test "x$merit_cv_need_acc_widget" = "xyes"; then + _MERIT_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets]) fi - _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal]) + _MERIT_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]) + _MERIT_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]) + _MERIT_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]) + _MERIT_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 else if test x$TARGET_OS = xwindows; then AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) - _BITCOIN_QT_CHECK_STATIC_PLUGINS([ + _MERIT_QT_CHECK_STATIC_PLUGINS([ Q_IMPORT_PLUGIN(qcncodecs) Q_IMPORT_PLUGIN(qjpcodecs) Q_IMPORT_PLUGIN(qtwcodecs) @@ -161,13 +161,13 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ ]) if test x$use_pkgconfig$qt_bin_path = xyes; then - if test x$bitcoin_qt_got_major_vers = x5; then + if test x$merit_qt_got_major_vers = x5; then qt_bin_path="`$PKG_CONFIG --variable=host_bins Qt5Core 2>/dev/null`" fi fi if test x$use_hardening != xno; then - BITCOIN_QT_CHECK([ + MERIT_QT_CHECK([ AC_MSG_CHECKING(whether -fPIE can be used with this Qt config) TEMP_CPPFLAGS=$CPPFLAGS TEMP_CXXFLAGS=$CXXFLAGS @@ -186,7 +186,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ CXXFLAGS=$TEMP_CXXFLAGS ]) else - BITCOIN_QT_CHECK([ + MERIT_QT_CHECK([ AC_MSG_CHECKING(whether -fPIC is needed with this Qt config) TEMP_CPPFLAGS=$CPPFLAGS CPPFLAGS="$QT_INCLUDES $CPPFLAGS" @@ -203,23 +203,23 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ ]) fi - BITCOIN_QT_PATH_PROGS([MOC], [moc-qt${bitcoin_qt_got_major_vers} moc${bitcoin_qt_got_major_vers} moc], $qt_bin_path) - BITCOIN_QT_PATH_PROGS([UIC], [uic-qt${bitcoin_qt_got_major_vers} uic${bitcoin_qt_got_major_vers} uic], $qt_bin_path) - BITCOIN_QT_PATH_PROGS([RCC], [rcc-qt${bitcoin_qt_got_major_vers} rcc${bitcoin_qt_got_major_vers} rcc], $qt_bin_path) - BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt${bitcoin_qt_got_major_vers} lrelease${bitcoin_qt_got_major_vers} lrelease], $qt_bin_path) - BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt${bitcoin_qt_got_major_vers} lupdate${bitcoin_qt_got_major_vers} lupdate],$qt_bin_path, yes) + MERIT_QT_PATH_PROGS([MOC], [moc-qt${merit_qt_got_major_vers} moc${merit_qt_got_major_vers} moc], $qt_bin_path) + MERIT_QT_PATH_PROGS([UIC], [uic-qt${merit_qt_got_major_vers} uic${merit_qt_got_major_vers} uic], $qt_bin_path) + MERIT_QT_PATH_PROGS([RCC], [rcc-qt${merit_qt_got_major_vers} rcc${merit_qt_got_major_vers} rcc], $qt_bin_path) + MERIT_QT_PATH_PROGS([LRELEASE], [lrelease-qt${merit_qt_got_major_vers} lrelease${merit_qt_got_major_vers} lrelease], $qt_bin_path) + MERIT_QT_PATH_PROGS([LUPDATE], [lupdate-qt${merit_qt_got_major_vers} lupdate${merit_qt_got_major_vers} lupdate],$qt_bin_path, yes) MOC_DEFS='-DHAVE_CONFIG_H -I$(srcdir)' case $host in *darwin*) - BITCOIN_QT_CHECK([ + MERIT_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([ + MERIT_QT_CHECK([ AX_CHECK_LINK_FLAG([[-mwindows]],[QT_LDFLAGS="$QT_LDFLAGS -mwindows"],[AC_MSG_WARN(-mwindows linker support not detected)]) ]) esac @@ -227,15 +227,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 + MERIT_QT_CHECK([ + merit_enable_qt=yes + merit_enable_qt_test=yes if test x$have_qt_test = xno; then - bitcoin_enable_qt_test=no + merit_enable_qt_test=no fi - bitcoin_enable_qt_dbus=no + merit_enable_qt_dbus=no if test x$use_dbus != xno && test x$have_qt_dbus = xyes; then - bitcoin_enable_qt_dbus=yes + merit_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.") @@ -244,9 +244,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ AC_MSG_WARN("lupdate is required to update qt translations") fi ],[ - bitcoin_enable_qt=no + merit_enable_qt=no ]) - AC_MSG_RESULT([$bitcoin_enable_qt (Qt${bitcoin_qt_got_major_vers})]) + AC_MSG_RESULT([$merit_enable_qt (Qt${merit_qt_got_major_vers})]) AC_SUBST(QT_PIE_FLAGS) AC_SUBST(QT_INCLUDES) @@ -256,7 +256,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ AC_SUBST(QT_DBUS_LIBS) AC_SUBST(QT_TEST_INCLUDES) AC_SUBST(QT_TEST_LIBS) - AC_SUBST(QT_SELECT, qt${bitcoin_qt_got_major_vers}) + AC_SUBST(QT_SELECT, qt${merit_qt_got_major_vers}) AC_SUBST(MOC_DEFS) ]) @@ -266,9 +266,9 @@ dnl ---- dnl Internal. Check if the included version of Qt is Qt5. 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: merit_cv_qt5=yes|no +AC_DEFUN([_MERIT_QT_CHECK_QT5],[ + AC_CACHE_CHECK(for Qt 5, merit_cv_qt5,[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[#include ]], [[ @@ -278,17 +278,17 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[ return 0; #endif ]])], - [bitcoin_cv_qt5=yes], - [bitcoin_cv_qt5=no]) + [merit_cv_qt5=yes], + [merit_cv_qt5=no]) ])]) dnl Internal. Check if the linked version of Qt was built as static libs. dnl Requires: Qt5. This check cannot determine if Qt4 is static. dnl Requires: INCLUDES and LIBS must be populated as necessary. -dnl Output: bitcoin_cv_static_qt=yes|no +dnl Output: merit_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([_MERIT_QT_IS_STATIC],[ + AC_CACHE_CHECK(for static Qt, merit_cv_static_qt,[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[#include ]], [[ @@ -298,10 +298,10 @@ AC_DEFUN([_BITCOIN_QT_IS_STATIC],[ choke me #endif ]])], - [bitcoin_cv_static_qt=yes], - [bitcoin_cv_static_qt=no]) + [merit_cv_static_qt=yes], + [merit_cv_static_qt=no]) ]) - if test xbitcoin_cv_static_qt = xyes; then + if test xmerit_cv_static_qt = xyes; then AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static Qt plugins]) fi ]) @@ -311,7 +311,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([_MERIT_QT_CHECK_STATIC_PLUGINS],[ AC_MSG_CHECKING(for static Qt plugins: $2) CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS" LIBS="$2 $QT_LIBS $LIBS" @@ -321,16 +321,16 @@ 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); MERIT_QT_FAIL(Could not resolve: $2)]) LIBS="$CHECK_STATIC_PLUGINS_TEMP_LIBS" ]) dnl Internal. Find paths necessary for linking qt static plugins -dnl Inputs: bitcoin_qt_got_major_vers. 4 or 5. +dnl Inputs: merit_qt_got_major_vers. 4 or 5. dnl Inputs: qt_plugin_path. optional. dnl Outputs: QT_LIBS is appended -AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[ - if test x$bitcoin_qt_got_major_vers = x5; then +AC_DEFUN([_MERIT_QT_FIND_STATIC_PLUGINS],[ + if test x$merit_qt_got_major_vers = x5; then 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 @@ -352,17 +352,17 @@ 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_COMPILE_IFELSE([AC_LANG_PROGRAM( + AC_CACHE_CHECK(for Qt >= 5.6, merit_cv_need_platformsupport,[AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[#include ]],[[ #if QT_VERSION < 0x050600 choke; #endif ]])], - [bitcoin_cv_need_platformsupport=yes], - [bitcoin_cv_need_platformsupport=no]) + [merit_cv_need_platformsupport=yes], + [merit_cv_need_platformsupport=no]) ]) - if test x$bitcoin_cv_need_platformsupport = xyes; then - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXPlatformSupport not found))) + if test x$merit_cv_need_platformsupport = xyes; then + MERIT_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,MERIT_QT_FAIL(lib$QT_LIB_PREFIXPlatformSupport not found))) fi fi fi @@ -375,49 +375,49 @@ 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: merit_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 merit_qt_want_version is "auto", check for this version dnl first. dnl Outputs: All necessary QT_* variables are set. -dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5". +dnl Outputs: merit_qt_got_major_vers is set to "4" or "5". 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([_MERIT_QT_FIND_LIBS_WITH_PKGCONFIG],[ m4_ifdef([PKG_CHECK_MODULES],[ auto_priority_version=$1 if test x$auto_priority_version = x; then auto_priority_version=qt5 fi - if test x$bitcoin_qt_want_version = xqt5 || ( test x$bitcoin_qt_want_version = xauto && test x$auto_priority_version = xqt5 ); then + if test x$merit_qt_want_version = xqt5 || ( test x$merit_qt_want_version = xauto && test x$auto_priority_version = xqt5 ); then QT_LIB_PREFIX=Qt5 - bitcoin_qt_got_major_vers=5 + merit_qt_got_major_vers=5 else QT_LIB_PREFIX=Qt - bitcoin_qt_got_major_vers=4 + merit_qt_got_major_vers=4 fi qt5_modules="Qt5Core Qt5Gui Qt5Network Qt5Widgets" qt4_modules="QtCore QtGui QtNetwork" - BITCOIN_QT_CHECK([ - if test x$bitcoin_qt_want_version = xqt5 || ( test x$bitcoin_qt_want_version = xauto && test x$auto_priority_version = xqt5 ); then + MERIT_QT_CHECK([ + if test x$merit_qt_want_version = xqt5 || ( test x$merit_qt_want_version = xauto && test x$auto_priority_version = xqt5 ); then PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" have_qt=yes],[have_qt=no]) - elif test x$bitcoin_qt_want_version = xqt4 || ( test x$bitcoin_qt_want_version = xauto && test x$auto_priority_version = xqt4 ); then + elif test x$merit_qt_want_version = xqt4 || ( test x$merit_qt_want_version = xauto && test x$auto_priority_version = xqt4 ); then PKG_CHECK_MODULES([QT4], [$qt4_modules], [QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes], [have_qt=no]) fi dnl qt version is set to 'auto' and the preferred version wasn't found. Now try the other. - if test x$have_qt = xno && test x$bitcoin_qt_want_version = xauto; then + if test x$have_qt = xno && test x$merit_qt_want_version = xauto; then if test x$auto_priority_version = xqt5; then - PKG_CHECK_MODULES([QT4], [$qt4_modules], [QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt; bitcoin_qt_got_major_vers=4], [have_qt=no]) + PKG_CHECK_MODULES([QT4], [$qt4_modules], [QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt; merit_qt_got_major_vers=4], [have_qt=no]) else - PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt5; bitcoin_qt_got_major_vers=5], [have_qt=no]) + PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt5; merit_qt_got_major_vers=5], [have_qt=no]) fi fi if test x$have_qt != xyes; then have_qt=no - BITCOIN_QT_FAIL([Qt dependencies not found]) + MERIT_QT_FAIL([Qt dependencies not found]) fi ]) - BITCOIN_QT_CHECK([ + MERIT_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]) @@ -429,66 +429,66 @@ 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: merit_qt_want_version (from --with-gui=). The version to use. +dnl If "auto", the version will be discovered by _MERIT_QT_CHECK_QT5. dnl Outputs: All necessary QT_* variables are set. -dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5". +dnl Outputs: merit_qt_got_major_vers is set to "4" or "5". 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([_MERIT_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[ TEMP_CPPFLAGS="$CPPFLAGS" TEMP_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$PIC_FLAGS $CXXFLAGS" TEMP_LIBS="$LIBS" - BITCOIN_QT_CHECK([ + MERIT_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))]) + MERIT_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,MERIT_QT_FAIL(QtCore headers missing))]) + MERIT_QT_CHECK([AC_CHECK_HEADER([QApplication],, MERIT_QT_FAIL(QtGui headers missing))]) + MERIT_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, MERIT_QT_FAIL(QtNetwork headers missing))]) - BITCOIN_QT_CHECK([ - if test x$bitcoin_qt_want_version = xauto; then - _BITCOIN_QT_CHECK_QT5 + MERIT_QT_CHECK([ + if test x$merit_qt_want_version = xauto; then + _MERIT_QT_CHECK_QT5 fi - if test x$bitcoin_cv_qt5 = xyes || test x$bitcoin_qt_want_version = xqt5; then + if test x$merit_cv_qt5 = xyes || test x$merit_qt_want_version = xqt5; then QT_LIB_PREFIX=Qt5 - bitcoin_qt_got_major_vers=5 + merit_qt_got_major_vers=5 else QT_LIB_PREFIX=Qt - bitcoin_qt_got_major_vers=4 + merit_qt_got_major_vers=4 fi ]) - BITCOIN_QT_CHECK([ + MERIT_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],, MERIT_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]))) - 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([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg 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]))) - BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng 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_PREFIXCore not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXGui not found))) - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXNetwork not found))) - if test x$bitcoin_qt_got_major_vers = x5; then - BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXWidgets not found))) + MERIT_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in]))) + MERIT_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in]))) + MERIT_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in]))) + MERIT_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in]))) + MERIT_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled]))) + MERIT_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,MERIT_QT_FAIL(lib$QT_LIB_PREFIXCore not found))) + MERIT_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,MERIT_QT_FAIL(lib$QT_LIB_PREFIXGui not found))) + MERIT_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,MERIT_QT_FAIL(lib$QT_LIB_PREFIXNetwork not found))) + if test x$merit_qt_got_major_vers = x5; then + MERIT_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,MERIT_QT_FAIL(lib$QT_LIB_PREFIXWidgets not found))) fi QT_LIBS="$LIBS" LIBS="$TEMP_LIBS" - BITCOIN_QT_CHECK([ + MERIT_QT_CHECK([ LIBS= if test x$qt_lib_path != x; then LIBS="-L$qt_lib_path" diff --git a/build-aux/m4/merit_subdir_to_include.m4 b/build-aux/m4/merit_subdir_to_include.m4 index 7841042ac..a19b04e41 100644 --- a/build-aux/m4/merit_subdir_to_include.m4 +++ b/build-aux/m4/merit_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 MERIT_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([MERIT_SUBDIR_TO_INCLUDE],[ if test "x$2" = "x"; then AC_MSG_RESULT([default]) else diff --git a/configure.ac b/configure.ac index 5c4623874..a50505c1d 100644 --- a/configure.ac +++ b/configure.ac @@ -7,17 +7,17 @@ define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2017) define(_COPYRIGHT_HOLDERS,[The %s developers]) -define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]]) -AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/]) +define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Merit Core]]) +AC_INIT([Merit Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[merit],[https://meritcore.org/]) AC_CONFIG_SRCDIR([src/validation.cpp]) -AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) +AC_CONFIG_HEADERS([src/config/merit-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 +MERIT_DAEMON_NAME=meritd +MERIT_GUI_NAME=merit-qt +MERIT_CLI_NAME=merit-cli +MERIT_TX_NAME=merit-tx dnl Unless the user specified ARFLAGS, force it to be cr AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to if not set]) @@ -27,9 +27,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 MERIT_CONFIG_H]) +AH_TOP([#define MERIT_CONFIG_H]) +AH_BOTTOM([#endif //MERIT_CONFIG_H]) dnl faketime breaks configure and is only needed for make. Disable it here. unset FAKETIME @@ -291,21 +291,21 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS" AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build bitcoin-cli bitcoin-tx (default=yes)])], - [build_bitcoin_utils=$withval], - [build_bitcoin_utils=yes]) + [build merit-cli merit-tx (default=yes)])], + [build_merit_utils=$withval], + [build_merit_utils=yes]) AC_ARG_WITH([libs], [AS_HELP_STRING([--with-libs], [build libraries (default=yes)])], - [build_bitcoin_libs=$withval], - [build_bitcoin_libs=yes]) + [build_merit_libs=$withval], + [build_merit_libs=yes]) AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], - [build bitcoind daemon (default=yes)])], - [build_bitcoind=$withval], - [build_bitcoind=yes]) + [build meritd daemon (default=yes)])], + [build_meritd=$withval], + [build_meritd=yes]) use_pkgconfig=yes case $host in @@ -500,7 +500,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 merit-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 @@ -707,7 +707,7 @@ AC_SUBST(LIBMEMENV) if test x$enable_wallet != xno; then dnl Check for libdb_cxx only if wallet enabled - BITCOIN_FIND_BDB48 + MERIT_FIND_BDB48 fi dnl Check for libminiupnpc (optional) @@ -719,12 +719,12 @@ if test x$use_upnp != xno; then ) fi -BITCOIN_QT_INIT +MERIT_QT_INIT -dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus -BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) +dnl sets $merit_enable_qt, $merit_enable_qt_test, $merit_enable_qt_dbus +MERIT_QT_CONFIGURE([$use_pkgconfig], [qt5]) -if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then +if test x$build_merit_utils$build_meritd$merit_enable_qt$use_tests$use_bench = xnonononono; then use_boost=no else use_boost=yes @@ -906,11 +906,11 @@ 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.)]) - BITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])]) + MERIT_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [MERIT_QT_FAIL(libprotobuf not found)])]) if test x$use_qr != xno; then - BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) + MERIT_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) fi - if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then + if test x$build_merit_utils$build_meritd$merit_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.)]) @@ -935,7 +935,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_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then + if test x$build_merit_utils$build_meritd$merit_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 @@ -966,10 +966,10 @@ else esac fi - BITCOIN_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], BITCOIN_QT_FAIL(libprotobuf not found))) + MERIT_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], MERIT_QT_FAIL(libprotobuf not found))) 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)]) + MERIT_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])]) + MERIT_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)]) fi fi @@ -984,7 +984,7 @@ dnl univalue check need_bundled_univalue=yes -if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then +if test x$build_merit_utils$build_meritd$merit_enable_qt$use_tests$use_bench = xnonononono; then need_bundled_univalue=no else @@ -1028,23 +1028,23 @@ AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$need_bundled_univalue = xyes]) AC_SUBST(UNIVALUE_CFLAGS) AC_SUBST(UNIVALUE_LIBS) -BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) +MERIT_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) -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 meritd]) +AM_CONDITIONAL([BUILD_MERITD], [test x$build_meritd = xyes]) +AC_MSG_RESULT($build_meritd) -AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) -AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) -AC_MSG_RESULT($build_bitcoin_utils) +AC_MSG_CHECKING([whether to build utils (merit-cli merit-tx)]) +AM_CONDITIONAL([BUILD_MERIT_UTILS], [test x$build_merit_utils = xyes]) +AC_MSG_RESULT($build_merit_utils) 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_MERIT_LIBS], [test x$build_merit_libs = xyes]) +if test x$build_merit_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([libmeritconsensus.pc:libmeritconsensus.pc.in]) fi -AC_MSG_RESULT($build_bitcoin_libs) +AC_MSG_RESULT($build_merit_libs) AC_LANG_POP @@ -1106,13 +1106,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$merit_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$merit_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($merit_enable_qt_dbus) dnl enable qr support AC_MSG_CHECKING([whether to build GUI with support for QR codes]) @@ -1135,8 +1135,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_merit-qt]) + if test x$use_gui_tests$merit_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="yes" else @@ -1146,7 +1146,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_merit]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="yes" @@ -1162,7 +1162,7 @@ else AC_MSG_RESULT([no]) fi -if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests = xnononononono; then +if test x$build_merit_utils$build_merit_libs$build_meritd$merit_enable_qt$use_bench$use_tests = xnononononono; 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 @@ -1171,7 +1171,7 @@ AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin]) 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_QT],[test x$bitcoin_enable_qt = xyes]) +AM_CONDITIONAL([ENABLE_QT],[test x$merit_enable_qt = xyes]) AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes]) AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes]) AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes]) @@ -1200,10 +1200,10 @@ 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(MERIT_DAEMON_NAME) +AC_SUBST(MERIT_GUI_NAME) +AC_SUBST(MERIT_CLI_NAME) +AC_SUBST(MERIT_TX_NAME) AC_SUBST(RELDFLAGS) AC_SUBST(ERROR_CXXFLAGS) @@ -1232,7 +1232,7 @@ AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh]) AC_CONFIG_FILES([doc/Doxyfile]) 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/merit-util-test.py:test/util/merit-util-test.py]) dnl boost's m4 checks do something really nasty: they export these vars. As a dnl result, they leak into secp256k1's configure and crazy things happen. @@ -1288,9 +1288,9 @@ 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 " qt version = $bitcoin_qt_got_major_vers" +echo " with gui / qt = $merit_enable_qt" +if test x$merit_enable_qt != xno; then + echo " qt version = $merit_qt_got_major_vers" echo " with qr = $use_qr" fi echo " with zmq = $use_zmq" diff --git a/contrib/README.md b/contrib/README.md index 34c4cfc55..36056553d 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain. ### [Qos](/contrib/qos) ### -A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. 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. +A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Merit network. This means one can have an always-on meritd instance running, and another local meritd/merit-qt instance which connects to this node and receives blocks from it. ### [Seeds](/contrib/seeds) ### Utility to generate the pnSeed[] array that is compiled into the client. @@ -22,20 +22,20 @@ Build Tools and Keys --------------------- ### [Debian](/contrib/debian) ### -Contains files used to package bitcoind/bitcoin-qt -for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here. +Contains files used to package meritd/merit-qt +for Debian-based Linux systems. If you compile meritd/merit-qt yourself, there are some useful files here. ### [Gitian-descriptors](/contrib/gitian-descriptors) ### Notes on getting Gitian builds up and running using KVM. ### [Gitian-keys](/contrib/gitian-keys) -PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results. +PGP keys used for signing Merit Core [Gitian release](/doc/release-process.md) results. ### [MacDeploy](/contrib/macdeploy) ### Scripts and notes for Mac builds. ### [RPM](/contrib/rpm) ### -RPM spec file for building bitcoin-core on RPM based distributions. +RPM spec file for building merit-core on RPM based distributions. ### [Gitian-build](/contrib/gitian-build.sh) ### Script for running full Gitian builds. @@ -44,7 +44,7 @@ Test and Verify Tools --------------------- ### [TestGen](/contrib/testgen) ### -Utilities to generate test vectors for the data-driven Bitcoin tests. +Utilities to generate test vectors for the data-driven Merit tests. ### [Verify Binaries](/contrib/verifybinaries) ### This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org. diff --git a/contrib/debian/README.md b/contrib/debian/README.md index fab9cc238..aa4aba4c1 100644 --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -1,21 +1,21 @@ Debian ==================== -This directory contains files used to package bitcoind/bitcoin-qt -for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here. +This directory contains files used to package meritd/merit-qt +for Debian-based Linux systems. If you compile meritd/merit-qt yourself, there are some useful files here. -## bitcoin: URI support ## +## merit: URI support ## -bitcoin-qt.desktop (Gnome / Open Desktop) +merit-qt.desktop (Gnome / Open Desktop) To install: - sudo desktop-file-install bitcoin-qt.desktop + sudo desktop-file-install merit-qt.desktop sudo update-desktop-database If you build yourself, you will either need to modify the paths in -the .desktop file or copy or symlink your bitcoin-qt binary to `/usr/bin` -and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps` +the .desktop file or copy or symlink your merit-qt binary to `/usr/bin` +and the `../../share/pixmaps/merit128.png` to `/usr/share/pixmaps` -bitcoin-qt.protocol (KDE) +merit-qt.protocol (KDE) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 33dab9b63..b5e66449f 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,364 +1,364 @@ -bitcoin (0.14.1-trusty4) trusty; urgency=medium +merit (0.14.1-trusty4) trusty; urgency=medium * Re-enable UPnP support. -- Matt Corallo (BlueMatt) Fri, 05 May 2017 13:28:00 -0400 -bitcoin (0.14.1-trusty3) trusty; urgency=medium +merit (0.14.1-trusty3) trusty; urgency=medium * Build with qt5 if we are on a non-Ubuntu (ie non-Unity) distro. -- Matt Corallo (BlueMatt) Thu, 04 May 2017 17:13:00 -0400 -bitcoin (0.14.1-trusty2) trusty; urgency=medium +merit (0.14.1-trusty2) trusty; urgency=medium * Bump minimum boost version in deps. -- Matt Corallo (BlueMatt) Thu, 04 May 2017 17:12:00 -0400 -bitcoin (0.14.1-trusty1) trusty; urgency=medium +merit (0.14.1-trusty1) trusty; urgency=medium * New upstream release. -- Matt Corallo (BlueMatt) Sat, 22 Apr 2017 17:10:00 -0400 -bitcoin (0.14.0-trusty1) trusty; urgency=medium +merit (0.14.0-trusty1) trusty; urgency=medium * New upstream release. -- Matt Corallo (BlueMatt) Wed, 08 Mar 2017 10:30:00 -0500 -bitcoin (0.13.2-trusty1) trusty; urgency=medium +merit (0.13.2-trusty1) trusty; urgency=medium * New upstream release. -- Matt Corallo (BlueMatt) Thu, 05 Jan 2017 09:59:00 -0500 -bitcoin (0.13.1-trusty2) trusty; urgency=medium +merit (0.13.1-trusty2) trusty; urgency=medium * Revert to Qt4, due to https://github.com/bitcoin/bitcoin/issues/9038 -- Matt Corallo (BlueMatt) Mon, 31 Oct 2016 11:16:00 -0400 -bitcoin (0.13.1-trusty1) trusty; urgency=medium +merit (0.13.1-trusty1) trusty; urgency=medium * New upstream release. - * Backport updated bitcoin-qt.desktop from upstream master + * Backport updated merit-qt.desktop from upstream master * Add zmq dependency * Switch to Qt5 (breaks precise, but that was already broken by C++11) -- Matt Corallo (BlueMatt) Thu, 27 Oct 2016 17:32:00 -0400 -bitcoin (0.13.0-trusty1) trusty; urgency=medium +merit (0.13.0-trusty1) trusty; urgency=medium * New upstream release. -- Matt Corallo (BlueMatt) Sun, 04 Sep 2016 22:09:00 -0400 -bitcoin (0.12.1-trusty1) trusty; urgency=medium +merit (0.12.1-trusty1) trusty; urgency=medium * New upstream release. -- Matt Corallo (BlueMatt) Mon, 18 Apr 2016 14:26:00 -0700 -bitcoin (0.12.0-trusty6) trusty; urgency=medium +merit (0.12.0-trusty6) trusty; urgency=medium * Fix program-options dep. -- Matt Corallo (BlueMatt) Fri, 25 Mar 2016 21:41:00 -0700 -bitcoin (0.12.0-trusty5) trusty; urgency=medium +merit (0.12.0-trusty5) trusty; urgency=medium * Test explicit --with-gui -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 23:25:00 -0800 -bitcoin (0.12.0-trusty4) trusty; urgency=medium +merit (0.12.0-trusty4) trusty; urgency=medium * Fix libevent-dev dep. -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 23:25:00 -0800 -bitcoin (0.12.0-trusty3) trusty; urgency=medium +merit (0.12.0-trusty3) trusty; urgency=medium * Fix precise boost dep. -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:55:00 -0800 -bitcoin (0.12.0-trusty2) trusty; urgency=medium +merit (0.12.0-trusty2) trusty; urgency=medium * Fix libevent dep. -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:53:00 -0800 -bitcoin (0.12.0-trusty1) trusty; urgency=medium +merit (0.12.0-trusty1) trusty; urgency=medium * New upstream release * Various updates to contrib/debian were merged, a few were not -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:29:00 -0800 -bitcoin (0.11.2-trusty1) trusty; urgency=low +merit (0.11.2-trusty1) trusty; urgency=low * New upstream release. -- Matt Corallo (BlueMatt) Fri, 13 Nov 2015 18:39:00 -0800 -bitcoin (0.11.1-trusty2) trusty; urgency=low +merit (0.11.1-trusty2) trusty; urgency=low * Remove minupnpc builddep. -- Matt Corallo (BlueMatt) Wed, 14 Oct 2015 23:06:00 -1000 -bitcoin (0.11.1-trusty1) trusty; urgency=high +merit (0.11.1-trusty1) trusty; urgency=high * New upstream release. * Disable all UPnP support. -- Matt Corallo (BlueMatt) Wed, 14 Oct 2015 13:57:00 -1000 -bitcoin (0.11.0-precise1) precise; urgency=medium +merit (0.11.0-precise1) precise; urgency=medium * New upstream release. -- Matt Corallo (BlueMatt) Tue, 14 Jul 2015 14:39:00 -1000 -bitcoin (0.10.2-precise1) precise; urgency=medium +merit (0.10.2-precise1) precise; urgency=medium * New upstream release. -- Matt Corallo (BlueMatt) Mon, 29 Jun 2015 17:33:00 -1000 -bitcoin (0.10.1-precise3) precise; urgency=medium +merit (0.10.1-precise3) precise; urgency=medium * Fix build dep (include python). -- Matt Corallo (BlueMatt) Tue, 5 May 2015 09:28:00 -1000 -bitcoin (0.10.1-precise2) precise; urgency=medium +merit (0.10.1-precise2) precise; urgency=medium * Fix miniupnpc dep. -- Matt Corallo (BlueMatt) Tue, 5 May 2015 00:33:00 -1000 -bitcoin (0.10.1-precise1) precise; urgency=medium +merit (0.10.1-precise1) precise; urgency=medium * New upstream release. -- Matt Corallo (BlueMatt) Tue, 5 May 2015 00:07:00 -1000 -bitcoin (0.10.0-precise1) precise; urgency=medium +merit (0.10.0-precise1) precise; urgency=medium * New upstream releases. -- Matt Corallo (BlueMatt) Wed, 18 Feb 2015 13:22:00 -1000 -bitcoin (0.9.4-precise1) precise; urgency=high +merit (0.9.4-precise1) precise; urgency=high * New upstream releases. -- Matt Corallo (laptop - only while traveling) Mon, 12 Jan 2015 23:30:00 -1000 -bitcoin (0.9.3-precise1) precise; urgency=medium +merit (0.9.3-precise1) precise; urgency=medium * New upstream releases. -- Matt Corallo (BlueMatt) Fri, 26 Sep 2014 12:01:00 -0700 -bitcoin (0.9.1-precise1) precise; urgency=medium +merit (0.9.1-precise1) precise; urgency=medium * New upstream release. * Backport pull #4019 -- Matt Corallo Sat, 19 Apr 2014 17:29:00 -0400 -bitcoin (0.9.0-precise1) precise; urgency=medium +merit (0.9.0-precise1) precise; urgency=medium * New upstream release. -- Matt Corallo Thu, 20 Mar 2014 13:10:00 -0400 -bitcoin (0.8.6-precise1) precise; urgency=medium +merit (0.8.6-precise1) precise; urgency=medium * New upstream release. * Make .desktop paths non-fixed (suggested by prusnak@github) -- Matt Corallo Fri, 13 Dec 2013 13:31:00 -0400 -bitcoin (0.8.5-precise1) precise; urgency=medium +merit (0.8.5-precise1) precise; urgency=medium * New upstream release. -- Matt Corallo Sun, 15 Sep 2013 14:02:00 -0400 -bitcoin (0.8.4-precise1) precise; urgency=medium +merit (0.8.4-precise1) precise; urgency=medium * New upstream release. -- Matt Corallo Wed, 4 Sep 2013 10:25:00 -0400 -bitcoin (0.8.3-natty1) natty; urgency=low +merit (0.8.3-natty1) natty; urgency=low * New upstream release. -- Matt Corallo Wed, 26 Jun 2013 00:18:00 +0100 -bitcoin (0.8.2-natty1) natty; urgency=low +merit (0.8.2-natty1) natty; urgency=low * New upstream release. -- Matt Corallo Wed, 29 Mar 2013 23:23:00 +0100 -bitcoin (0.8.1-natty3) natty; urgency=low +merit (0.8.1-natty3) natty; urgency=low * New pixmaps -- Jonas Schnelli Mon, 13 May 2013 16:14:00 +0100 -bitcoin (0.8.1-natty2) natty; urgency=low +merit (0.8.1-natty2) natty; urgency=low * Remove dumb broken launcher script -- Matt Corallo Sun, 24 Mar 2013 20:01:00 -0400 -bitcoin (0.8.1-natty1) natty; urgency=low +merit (0.8.1-natty1) natty; urgency=low * New upstream release. -- Matt Corallo Tue, 19 Mar 2013 13:03:00 -0400 -bitcoin (0.8.0-natty1) natty; urgency=low +merit (0.8.0-natty1) natty; urgency=low * New upstream release. -- Matt Corallo Sat, 23 Feb 2013 16:01:00 -0500 -bitcoin (0.7.2-natty1) natty; urgency=low +merit (0.7.2-natty1) natty; urgency=low * New upstream release. -- Matt Corallo Sat, 15 Dec 2012 10:59:00 -0400 -bitcoin (0.7.1-natty1) natty; urgency=low +merit (0.7.1-natty1) natty; urgency=low * New upstream release. -- Matt Corallo Wed, 24 Oct 2012 15:06:00 -0400 -bitcoin (0.7.0-natty1) natty; urgency=low +merit (0.7.0-natty1) natty; urgency=low * New upstream release. -- Matt Corallo Mon, 17 Sep 2012 13:45:00 +0200 -bitcoin (0.6.3-natty1) natty; urgency=low +merit (0.6.3-natty1) natty; urgency=low * New upstream release. -- Matt Corallo Mon, 25 Jun 2012 23:47:00 +0200 -bitcoin (0.6.2-natty1) natty; urgency=low +merit (0.6.2-natty1) natty; urgency=low * Update package description and launch scripts. -- Matt Corallo Sat, 2 Jun 2012 16:41:00 +0200 -bitcoin (0.6.2-natty0) natty; urgency=low +merit (0.6.2-natty0) natty; urgency=low * New upstream release. -- Matt Corallo Tue, 8 May 2012 16:27:00 -0500 -bitcoin (0.6.1-natty0) natty; urgency=low +merit (0.6.1-natty0) natty; urgency=low * New upstream release. -- Matt Corallo Sun, 6 May 2012 20:09:00 -0500 -bitcoin (0.6.0-natty0) natty; urgency=low +merit (0.6.0-natty0) natty; urgency=low * New upstream release. - * Add GNOME/KDE support for bitcoin-qt's bitcoin: URI support. + * Add GNOME/KDE support for merit-qt's merit: URI support. Thanks to luke-jr for the KDE .protocol file. -- Matt Corallo Sat, 31 Mar 2012 15:35:00 -0500 -bitcoin (0.5.3-natty1) natty; urgency=low +merit (0.5.3-natty1) natty; urgency=low * Mark for upload to PPA. -- Matt Corallo Wed, 14 Mar 2012 23:06:00 -0400 -bitcoin (0.5.3-natty0) natty; urgency=low +merit (0.5.3-natty0) natty; urgency=low * New upstream release. - -- Luke Dashjr Tue, 10 Jan 2012 15:57:00 -0500 + -- Luke Dashjr Tue, 10 Jan 2012 15:57:00 -0500 -bitcoin (0.5.2-natty1) natty; urgency=low +merit (0.5.2-natty1) natty; urgency=low * Remove mentions on anonymity in package descriptions and manpage. - These should never have been there, bitcoin isnt anonymous without + These should never have been there, merit isnt anonymous without a ton of work that virtually no users will ever be willing and capable of doing -- Matt Corallo Sat, 7 Jan 2012 13:37:00 -0500 -bitcoin (0.5.2-natty0) natty; urgency=low +merit (0.5.2-natty0) natty; urgency=low * New upstream release. - -- Luke Dashjr Fri, 16 Dec 2011 17:57:00 -0500 + -- Luke Dashjr Fri, 16 Dec 2011 17:57:00 -0500 -bitcoin (0.5.1-natty0) natty; urgency=low +merit (0.5.1-natty0) natty; urgency=low * New upstream release. -- Matt Corallo Fri, 16 Dec 2011 13:27:00 -0500 -bitcoin (0.5.0-natty0) natty; urgency=low +merit (0.5.0-natty0) natty; urgency=low * New upstream release. -- Matt Corallo Mon, 21 Nov 2011 11:32:00 -0500 -bitcoin (0.5.0~rc7-natty0) natty; urgency=low +merit (0.5.0~rc7-natty0) natty; urgency=low * New upstream release candidate. -- Matt Corallo Sun, 20 Nov 2011 17:08:00 -0500 -bitcoin (0.5.0~rc3-natty0) natty; urgency=low +merit (0.5.0~rc3-natty0) natty; urgency=low * New upstream release candidate. - * Don't set rpcpassword for bitcoin-qt. + * Don't set rpcpassword for merit-qt. -- Matt Corallo Tue, 8 Nov 2011 11:56:00 -0400 -bitcoin (0.5.0~rc1-natty1) natty; urgency=low +merit (0.5.0~rc1-natty1) natty; urgency=low - * Add test_bitcoin to build test + * Add test_merit to build test * Fix clean * Remove uneccessary build-dependancies -- Matt Corallo Wed, 26 Oct 2011 14:37:18 -0400 -bitcoin (0.5.0~rc1-natty0) natty; urgency=low +merit (0.5.0~rc1-natty0) natty; urgency=low * Mark for natty * Fix broken build * Fix copyright listing - * Remove bitcoin: URL handler until bitcoin actually has support for it (Oops) + * Remove merit: URL handler until merit actually has support for it (Oops) -- Matt Corallo Wed, 26 Oct 2011 14:37:18 -0400 -bitcoin (0.5.0~rc1-2) experimental; urgency=low +merit (0.5.0~rc1-2) experimental; urgency=low - * Add bitcoin-qt + * Add merit-qt -- Matt Corallo Tue, 25 Oct 2011 15:24:18 -0400 -bitcoin (0.5.0~rc1-1) experimental; urgency=low +merit (0.5.0~rc1-1) experimental; urgency=low * New upstream prerelease. * Add Github as alternate upstream source in watch file. @@ -369,7 +369,7 @@ bitcoin (0.5.0~rc1-1) experimental; urgency=low -- Jonas Smedegaard Fri, 14 Oct 2011 00:16:18 +0200 -bitcoin (0.4.0-1) unstable; urgency=low +merit (0.4.0-1) unstable; urgency=low * New upstream release. * Stop repackaging source tarballs: No DFSG-violating stripping left. @@ -378,7 +378,7 @@ bitcoin (0.4.0-1) unstable; urgency=low * Drop dpkg-source local-options hint: Declared options are default since dpkg-source 1.16.1. + Add irc URL to Upstream-Contact. - + Add comment on Bitcoin Developers to catch-all Files section. + + Add comment on Merit Developers to catch-all Files section. + Add Files sections for newly readded src/cryptopp/* (new custom BSD-like license), and newly added doc/build-osx.txt and src/makefile.osx (Expat). @@ -397,13 +397,13 @@ bitcoin (0.4.0-1) unstable; urgency=low -- Jonas Smedegaard Wed, 05 Oct 2011 01:48:53 +0200 -bitcoin (0.3.24~dfsg-1) unstable; urgency=low +merit (0.3.24~dfsg-1) unstable; urgency=low * New upstream release. [ Jonas Smedegaard ] * Improve various usage hints: - + Explicitly mention in long description that bitcoind contains + + Explicitly mention in long description that meritd contains daemon and command-line interface. + Extend README.Debian with section on lack of GUI, and add primary headline. @@ -424,7 +424,7 @@ bitcoin (0.3.24~dfsg-1) unstable; urgency=low -- Jonas Smedegaard Tue, 19 Jul 2011 15:08:54 +0200 -bitcoin (0.3.21~dfsg-2) unstable; urgency=low +merit (0.3.21~dfsg-2) unstable; urgency=low * Enable UPNP support: + Drop patch 1006. @@ -433,7 +433,7 @@ bitcoin (0.3.21~dfsg-2) unstable; urgency=low -- Jonas Smedegaard Sat, 28 May 2011 15:52:44 +0200 -bitcoin (0.3.21~dfsg-1) unstable; urgency=low +merit (0.3.21~dfsg-1) unstable; urgency=low * New upstream release. * Refresh patches. @@ -446,7 +446,7 @@ bitcoin (0.3.21~dfsg-1) unstable; urgency=low * Bump policy compliance to standards-version 3.9.2. * Shorten Vcs-Browser paragraph in control file. * Fix mention daemon (not CLI tools) in short description. - * Stop conflicting with or replace bitcoin-cli: Only transitional, no + * Stop conflicting with or replace merit-cli: Only transitional, no longer needed. * Link against unversioned berkeleydb. Update NEWS and README.Debian accordingly (and improve wording while at it). @@ -458,7 +458,7 @@ bitcoin (0.3.21~dfsg-1) unstable; urgency=low -- Jonas Smedegaard Tue, 17 May 2011 15:31:24 +0200 -bitcoin (0.3.20.2~dfsg-2) unstable; urgency=medium +merit (0.3.20.2~dfsg-2) unstable; urgency=medium * Fix have wrapper script execute real binary (not loop executing itself). @@ -468,15 +468,15 @@ bitcoin (0.3.20.2~dfsg-2) unstable; urgency=medium -- Jonas Smedegaard Wed, 16 Mar 2011 09:11:06 +0100 -bitcoin (0.3.20.2~dfsg-1) unstable; urgency=low +merit (0.3.20.2~dfsg-1) unstable; urgency=low * New upstream release. - * Fix provide and replace former package name bitcoin-cli. + * Fix provide and replace former package name merit-cli. Closes: bug#618439. Thanks to Shane Wegner. -- Jonas Smedegaard Tue, 15 Mar 2011 11:41:43 +0100 -bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low +merit (0.3.20.01~dfsg-1) unstable; urgency=low * New upstream release. @@ -484,7 +484,7 @@ bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low * Add myself as uploader. [ Jonas Smedegaard ] - * Add wrapper for bitcoind to ease initial startup. + * Add wrapper for meritd to ease initial startup. * Update patches: + Drop patch 2002: Applied upstream. + Add patch 1005 to add phtread linker option. @@ -492,12 +492,12 @@ bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low + Refresh patches. * Extend copyright years in rules file header. * Rewrite copyright file using draft svn166 of DEP5 format. - * Rename binary package to bitcoind (from bincoin-cli). + * Rename binary package to meritd (from bincoin-cli). Closes: bug#614025. Thanks to Luke-Jr. -- Jonas Smedegaard Tue, 01 Mar 2011 15:55:04 +0100 -bitcoin (0.3.19~dfsg-6) unstable; urgency=low +merit (0.3.19~dfsg-6) unstable; urgency=low * Fix override agressive optimizations. * Fix tighten build-dependencies to really fit backporting to Lenny: @@ -508,7 +508,7 @@ bitcoin (0.3.19~dfsg-6) unstable; urgency=low -- Jonas Smedegaard Mon, 17 Jan 2011 19:48:35 +0100 -bitcoin (0.3.19~dfsg-5) unstable; urgency=low +merit (0.3.19~dfsg-5) unstable; urgency=low * Fix lower Boost fallback-build-dependencies to 1.35, really available in Lenny. @@ -523,11 +523,11 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low -- Jonas Smedegaard Mon, 17 Jan 2011 16:04:48 +0100 -bitcoin (0.3.19~dfsg-4) unstable; urgency=low +merit (0.3.19~dfsg-4) unstable; urgency=low [ Micah Anderson ] - * Provide example bitcoin.conf. - * Add bitcoind(1) and bitcoin.conf(5) man pages. + * Provide example merit.conf. + * Add meritd(1) and merit.conf(5) man pages. [ Jonas Smedegaard ] * Ease backporting: @@ -539,7 +539,7 @@ bitcoin (0.3.19~dfsg-4) unstable; urgency=low -- Jonas Smedegaard Mon, 17 Jan 2011 14:00:48 +0100 -bitcoin (0.3.19~dfsg-3) unstable; urgency=low +merit (0.3.19~dfsg-3) unstable; urgency=low * Document in copyright file files excluded from repackaged source. * Update copyright file: @@ -554,7 +554,7 @@ bitcoin (0.3.19~dfsg-3) unstable; urgency=low -- Jonas Smedegaard Fri, 07 Jan 2011 22:50:57 +0100 -bitcoin (0.3.19~dfsg-2) unstable; urgency=low +merit (0.3.19~dfsg-2) unstable; urgency=low * Adjust build options to use optimized miner only for amd64. Fixes FTBFS on i386 (and other archs, if compiling anywhere else at all). @@ -569,7 +569,7 @@ bitcoin (0.3.19~dfsg-2) unstable; urgency=low -- Jonas Smedegaard Wed, 29 Dec 2010 00:27:54 +0100 -bitcoin (0.3.19~dfsg-1) unstable; urgency=low +merit (0.3.19~dfsg-1) unstable; urgency=low [ Jonas Smedegaard ] * Initial release. diff --git a/contrib/debian/control b/contrib/debian/control index 0d6ad25e2..d29f99d08 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,4 +1,4 @@ -Source: bitcoin +Source: merit Section: utils Priority: optional Maintainer: Matt Corallo @@ -26,45 +26,45 @@ Build-Depends: debhelper, python, libzmq3-dev Standards-Version: 3.9.2 -Homepage: https://bitcoincore.org/ -Vcs-Git: git://github.com/bitcoin/bitcoin.git -Vcs-Browser: https://github.com/bitcoin/bitcoin +Homepage: https://meritcore.org/ +Vcs-Git: git://github.com/merit/merit.git +Vcs-Browser: https://github.com/merit/merit -Package: bitcoind +Package: meritd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - daemon - Bitcoin is a free open source peer-to-peer electronic cash system that + Merit is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. . - This package provides the daemon, bitcoind, and the CLI tool - bitcoin-cli to interact with the daemon. + This package provides the daemon, meritd, and the CLI tool + merit-cli to interact with the daemon. -Package: bitcoin-qt +Package: merit-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - Qt GUI - Bitcoin is a free open source peer-to-peer electronic cash system that + Merit is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. . - This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. + This package provides Merit-Qt, a GUI for Merit based on Qt. -Package: bitcoin-tx +Package: merit-tx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer digital currency - standalone transaction tool - Bitcoin is a free open source peer-to-peer electronic cash system that + Merit is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. . - This package provides bitcoin-tx, a command-line transaction creation - tool which can be used without a bitcoin daemon. Some means of + This package provides merit-tx, a command-line transaction creation + tool which can be used without a merit daemon. Some means of exchanging minimal transaction data with peers is still required. diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 72d64ce62..5fca8bb50 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -1,13 +1,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Bitcoin +Upstream-Name: Merit Upstream-Contact: Satoshi Nakamoto - irc://#bitcoin@freenode.net -Source: https://github.com/bitcoin/bitcoin + irc://#merit@freenode.net +Source: https://github.com/merit/merit Files: * -Copyright: 2009-2017, Bitcoin Core Developers +Copyright: 2009-2017, Bitcoin Core developers License: Expat -Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org, +Comment: The Bitcoin Core developers encompasses the current developers listed on bitcoin.org, as well as the numerous contributors to the project. Files: debian/* @@ -78,9 +78,9 @@ License: Expat Comment: Modifications of Stephan Hutchings Typicons Files: src/qt/res/icons/about.png - src/qt/res/icons/bitcoin.* - share/pixmaps/bitcoin* - src/qt/res/src/bitcoin.svg + src/qt/res/icons/merit.* + share/pixmaps/merit* + src/qt/res/src/merit.svg Copyright: Bitboy, Jonas Schnelli License: public-domain Comment: Site: https://bitcointalk.org/?topic=1756.0 diff --git a/contrib/debian/examples/merit.conf b/contrib/debian/examples/merit.conf index 14a59fdf6..bfe5c63c6 100644 --- a/contrib/debian/examples/merit.conf +++ b/contrib/debian/examples/merit.conf @@ -1,10 +1,10 @@ ## -## bitcoin.conf configuration file. Lines beginning with # are comments. +## merit.conf configuration file. Lines beginning with # are comments. ## # Network-related settings: -# Run on the test network instead of the real bitcoin network. +# Run on the test network instead of the real merit network. #testnet=0 # Run a regression test network @@ -57,10 +57,10 @@ #maxconnections= # -# JSON-RPC options (for controlling a running Bitcoin/bitcoind process) +# JSON-RPC options (for controlling a running Merit/meritd process) # -# server=1 tells Bitcoin-Qt and bitcoind to accept JSON-RPC commands +# server=1 tells Merit-Qt and meritd to accept JSON-RPC commands #server=0 # Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. @@ -68,7 +68,7 @@ #rpcbind= # If no rpcpassword is set, rpc cookie auth is sought. The default `-rpccookiefile` name -# is .cookie and found in the `-datadir` being used for bitcoind. This option is typically used +# is .cookie and found in the `-datadir` being used for meritd. This option is typically used # when the server and client are run as the same user. # # If not, you must set rpcuser and rpcpassword to secure the JSON-RPC api. The first @@ -80,7 +80,7 @@ # using the output from the script in share/rpcuser/rpcuser.py after providing a username: # # ./share/rpcuser/rpcuser.py alice -# String to be appended to bitcoin.conf: +# String to be appended to merit.conf: # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae # Your password: # DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E= @@ -92,7 +92,7 @@ # You can even add multiple entries of these to the server conf file, and client can use any of them: # rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99 -# How many seconds bitcoin will wait for a complete RPC HTTP request. +# How many seconds merit will wait for a complete RPC HTTP request. # after the HTTP connection is established. #rpcclienttimeout=30 @@ -103,8 +103,8 @@ # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED, # because the rpcpassword is transmitted over the network unencrypted. -# server=1 tells Bitcoin-Qt to accept JSON-RPC commands. -# it is also read by bitcoind to determine if RPC should be enabled +# server=1 tells Merit-Qt to accept JSON-RPC commands. +# it is also read by meritd to determine if RPC should be enabled #rpcallowip=10.1.1.34/255.255.255.0 #rpcallowip=1.2.3.4/24 #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 @@ -112,7 +112,7 @@ # Listen for RPC connections on this TCP port: #rpcport=8332 -# You can use Bitcoin or bitcoind to send commands to Bitcoin/bitcoind +# You can use Merit or meritd to send commands to Merit/meritd # running on another host using this option: #rpcconnect=127.0.0.1 @@ -126,7 +126,7 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send bitcoins. Transactions with fees +# Pay an optional transaction fee every time you send merits. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. #paytxfee=0.00 @@ -140,7 +140,7 @@ # User interface options -# Start Bitcoin minimized +# Start Merit minimized #min=1 # Minimize to the system tray diff --git a/contrib/debian/merit-qt.desktop b/contrib/debian/merit-qt.desktop index 593d7584a..f15f7b43e 100644 --- a/contrib/debian/merit-qt.desktop +++ b/contrib/debian/merit-qt.desktop @@ -1,13 +1,13 @@ [Desktop Entry] Encoding=UTF-8 -Name=Bitcoin Core -Comment=Connect to the Bitcoin P2P Network -Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk -Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair -Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi -Exec=bitcoin-qt %u +Name=Merit Core +Comment=Connect to the Merit P2P Network +Comment[de]=Verbinde mit dem Merit peer-to-peer Netzwerk +Comment[fr]=Merit, monnaie virtuelle cryptographique pair à pair +Comment[tr]=Merit, eşten eşe kriptografik sanal para birimi +Exec=merit-qt %u Terminal=false Type=Application -Icon=bitcoin128 -MimeType=x-scheme-handler/bitcoin; +Icon=merit128 +MimeType=x-scheme-handler/merit; Categories=Office;Finance; diff --git a/contrib/debian/merit-qt.install b/contrib/debian/merit-qt.install index e0b32373b..43c8014ec 100644 --- a/contrib/debian/merit-qt.install +++ b/contrib/debian/merit-qt.install @@ -1,6 +1,6 @@ -usr/local/bin/bitcoin-qt usr/bin -share/pixmaps/bitcoin32.xpm usr/share/pixmaps -share/pixmaps/bitcoin16.xpm usr/share/pixmaps -share/pixmaps/bitcoin128.png usr/share/pixmaps -debian/bitcoin-qt.desktop usr/share/applications -debian/bitcoin-qt.protocol usr/share/kde4/services/ +usr/local/bin/merit-qt usr/bin +share/pixmaps/merit32.xpm usr/share/pixmaps +share/pixmaps/merit16.xpm usr/share/pixmaps +share/pixmaps/merit128.png usr/share/pixmaps +debian/merit-qt.desktop usr/share/applications +debian/merit-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/merit-qt.lintian-overrides b/contrib/debian/merit-qt.lintian-overrides index 7fb230eca..26705a7c2 100644 --- a/contrib/debian/merit-qt.lintian-overrides +++ b/contrib/debian/merit-qt.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -bitcoin-qt: possible-gpl-code-linked-with-openssl +merit-qt: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/merit-qt.manpages b/contrib/debian/merit-qt.manpages index 9a3cc31c0..f96ac13ad 100644 --- a/contrib/debian/merit-qt.manpages +++ b/contrib/debian/merit-qt.manpages @@ -1 +1 @@ -doc/man/bitcoin-qt.1 +doc/man/merit-qt.1 diff --git a/contrib/debian/merit-qt.protocol b/contrib/debian/merit-qt.protocol index 014588d53..0d572dcf8 100644 --- a/contrib/debian/merit-qt.protocol +++ b/contrib/debian/merit-qt.protocol @@ -1,6 +1,6 @@ [Protocol] -exec=bitcoin-qt '%u' -protocol=bitcoin +exec=merit-qt '%u' +protocol=merit input=none output=none helper=true diff --git a/contrib/debian/merit-tx.bash-completion b/contrib/debian/merit-tx.bash-completion index 7acb0b0ae..620095421 100644 --- a/contrib/debian/merit-tx.bash-completion +++ b/contrib/debian/merit-tx.bash-completion @@ -1 +1 @@ -contrib/bitcoin-tx.bash-completion bitcoin-tx +contrib/merit-tx.bash-completion merit-tx diff --git a/contrib/debian/merit-tx.install b/contrib/debian/merit-tx.install index 2c21052a6..6013f1231 100644 --- a/contrib/debian/merit-tx.install +++ b/contrib/debian/merit-tx.install @@ -1 +1 @@ -usr/local/bin/bitcoin-tx usr/bin +usr/local/bin/merit-tx usr/bin diff --git a/contrib/debian/merit-tx.manpages b/contrib/debian/merit-tx.manpages index 861d49d07..a3ba96465 100644 --- a/contrib/debian/merit-tx.manpages +++ b/contrib/debian/merit-tx.manpages @@ -1 +1 @@ -doc/man/bitcoin-tx.1 +doc/man/merit-tx.1 diff --git a/contrib/debian/meritd.bash-completion b/contrib/debian/meritd.bash-completion index 5c69d78fb..1c1feca31 100644 --- a/contrib/debian/meritd.bash-completion +++ b/contrib/debian/meritd.bash-completion @@ -1,2 +1,2 @@ -contrib/bitcoind.bash-completion bitcoind -contrib/bitcoin-cli.bash-completion bitcoin-cli +contrib/meritd.bash-completion meritd +contrib/merit-cli.bash-completion merit-cli diff --git a/contrib/debian/meritd.examples b/contrib/debian/meritd.examples index 4ded67d98..346627515 100644 --- a/contrib/debian/meritd.examples +++ b/contrib/debian/meritd.examples @@ -1 +1 @@ -debian/examples/bitcoin.conf +debian/examples/merit.conf diff --git a/contrib/debian/meritd.install b/contrib/debian/meritd.install index 798ea851f..6f0ad645c 100644 --- a/contrib/debian/meritd.install +++ b/contrib/debian/meritd.install @@ -1,2 +1,2 @@ -usr/local/bin/bitcoind usr/bin -usr/local/bin/bitcoin-cli usr/bin +usr/local/bin/meritd usr/bin +usr/local/bin/merit-cli usr/bin diff --git a/contrib/debian/meritd.lintian-overrides b/contrib/debian/meritd.lintian-overrides index 3f9f140bd..5e157fbe3 100644 --- a/contrib/debian/meritd.lintian-overrides +++ b/contrib/debian/meritd.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -bitcoind: possible-gpl-code-linked-with-openssl +meritd: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/meritd.manpages b/contrib/debian/meritd.manpages index bab644ece..8d4c86eb8 100644 --- a/contrib/debian/meritd.manpages +++ b/contrib/debian/meritd.manpages @@ -1,2 +1,2 @@ -doc/man/bitcoind.1 -doc/man/bitcoin-cli.1 +doc/man/meritd.1 +doc/man/merit-cli.1 diff --git a/contrib/debian/rules b/contrib/debian/rules index 6885e3852..2fb763dff 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -1,16 +1,16 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -#DEB_MAKE_CHECK_TARGET = test_bitcoin -#build/bitcoind:: -# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_bitcoin) +#DEB_MAKE_CHECK_TARGET = test_merit +#build/meritd:: +# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_merit) %: dh --with bash-completion $@ override_dh_auto_clean: if [ -f Makefile ]; then $(MAKE) distclean; fi - rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in + rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/merit-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5) diff --git a/contrib/debian/watch b/contrib/debian/watch index 4d9e0cfa5..42d27fa00 100644 --- a/contrib/debian/watch +++ b/contrib/debian/watch @@ -2,4 +2,4 @@ version=3 # use qa.debian.org redirector; see man uscan opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \ - http://githubredir.debian.net/github/bitcoin/bitcoin v(.*).tar.gz + http://githubredir.debian.net/github/merit/merit v(.*).tar.gz diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 67c5e15a1..93df17b71 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -23,7 +23,7 @@ git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v copyright\_header.py ==================== -Provides utilities for managing copyright headers of `The Bitcoin Core +Provides utilities for managing copyright headers of `The Merit Core developers` in repository source files. It has three subcommands: ``` @@ -94,7 +94,7 @@ the commit it claims to have been updated to. To use, make sure that you have fetched the upstream repository branch in which the subtree is maintained: * for `src/secp256k1`: https://github.com/bitcoin-core/secp256k1.git (branch master) -* for `src/leveldb`: https://github.com/bitcoin-core/leveldb.git (branch bitcoin-fork) +* for `src/leveldb`: https://github.com/bitcoin-core/leveldb.git (branch merit-fork) * for `src/univalue`: https://github.com/bitcoin-core/univalue.git (branch master) * for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master) @@ -112,7 +112,7 @@ For example: ./github-merge.py 3077 (in any git repository) will help you merge pull request #3077 for the -bitcoin/bitcoin repository. +merit/merit repository. What it does: * Fetch master and the pull request. @@ -130,16 +130,16 @@ couldn't mess with the sources. Setup --------- -Configuring the github-merge tool for the bitcoin repository is done in the following way: +Configuring the github-merge tool for the merit repository is done in the following way: - git config githubmerge.repository bitcoin/bitcoin + git config githubmerge.repository merit/merit git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing) git config --global user.signingkey mykeyid (if you want to GPG sign) optimize-pngs.py ================ -A script to optimize png files in the bitcoin +A script to optimize png files in the merit repository (requires pngcrush). security-check.py and test-security-check.py @@ -162,10 +162,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_merit: symbol memcpy from unsupported version GLIBC_2.14 + .../64/test_merit: symbol __fdelt_chk from unsupported version GLIBC_2.15 + .../64/test_merit: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 + .../64/test_merit: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 update-translations.py ====================== diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index 6d801d3ac..ecc15ffba 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -20,13 +20,13 @@ 'src/secp256k1/include/secp256k1_ecdh.h', 'src/secp256k1/include/secp256k1_recovery.h', 'src/secp256k1/include/secp256k1_schnorr.h', - 'src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.c', - 'src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.h', - 'src/secp256k1/src/java/org_bitcoin_Secp256k1Context.c', - 'src/secp256k1/src/java/org_bitcoin_Secp256k1Context.h', + 'src/secp256k1/src/java/org_merit_NativeSecp256k1.c', + 'src/secp256k1/src/java/org_merit_NativeSecp256k1.h', + 'src/secp256k1/src/java/org_merit_Secp256k1Context.c', + 'src/secp256k1/src/java/org_merit_Secp256k1Context.h', # auto generated: 'src/univalue/lib/univalue_escapes.h', - 'src/qt/bitcoinstrings.cpp', + 'src/qt/meritstrings.cpp', 'src/chainparamsseeds.h', # other external copyrights: 'src/tinyformat.h', @@ -85,9 +85,9 @@ def compile_copyright_regex(copyright_style, year_style, name): "Satoshi Nakamoto\n", "The Bitcoin Core developers\n", "The Bitcoin Core developers \n", - "Bitcoin Core Developers\n", + "Bitcoin Core developers\n", "the Bitcoin Core developers\n", - "The Bitcoin developers\n", + "The Merit developers\n", "The LevelDB Authors\. All rights reserved\.\n", "BitPay Inc\.\n", "BitPay, Inc\.\n", @@ -277,7 +277,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 merit source code repository. [verbose] - Includes a list of every file of each subcategory in the report. """ @@ -433,7 +433,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 merit source code repository. """ def print_file_action_message(filename, action): @@ -555,7 +555,7 @@ def exec_insert_header(filename, style): $ ./copyright_header.py insert Arguments: - - A source file in the bitcoin repository. + - A source file in the merit repository. """ def insert_cmd(argv): @@ -580,7 +580,7 @@ def insert_cmd(argv): ################################################################################ USAGE = """ -copyright_header.py - utilities for managing copyright headers of 'The Bitcoin +copyright_header.py - utilities for managing copyright headers of 'The Merit Core developers' in repository source files. Usage: diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 967717e1e..265cf81dc 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -4,26 +4,26 @@ TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} MANDIR=${MANDIR:-$TOPDIR/doc/man} -BITCOIND=${BITCOIND:-$SRCDIR/bitcoind} -BITCOINCLI=${BITCOINCLI:-$SRCDIR/bitcoin-cli} -BITCOINTX=${BITCOINTX:-$SRCDIR/bitcoin-tx} -BITCOINQT=${BITCOINQT:-$SRCDIR/qt/bitcoin-qt} +MERITD=${MERITD:-$SRCDIR/meritd} +MERITCLI=${MERITCLI:-$SRCDIR/merit-cli} +MERITTX=${MERITTX:-$SRCDIR/merit-tx} +MERITQT=${MERITQT:-$SRCDIR/qt/merit-qt} -[ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1 +[ ! -x $MERITD ] && echo "$MERITD not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -BTCVER=($($BITCOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) +MRTVER=($($MERITCLI --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 meritd if --version-string is not set, +# but has different outcomes for merit-qt and merit-cli. echo "[COPYRIGHT]" > footer.h2m -$BITCOIND --version | sed -n '1!p' >> footer.h2m +$MERITD --version | sed -n '1!p' >> footer.h2m -for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do +for cmd in $MERITD $MERITCLI $MERITTX $MERITQT; 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 + help2man -N --version-string=${MRTVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} + sed -i "s/\\\-${MRTVER[1]}//g" ${MANDIR}/${cmdname}.1 done rm -f footer.h2m diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py index 2941d2cb6..7562146f8 100755 --- a/contrib/devtools/github-merge.py +++ b/contrib/devtools/github-merge.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 Bitcoin Core Developers +# Copyright (c) 2016-2017 Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index 98daa1bd7..a1f1a301e 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 +# meritd and merit-qt b'libgcc_s.so.1', # GCC base support b'libc.so.6', # C library b'libpthread.so.0', # threading @@ -62,7 +62,7 @@ b'librt.so.1', # real-time (clock) b'ld-linux-x86-64.so.2', # 64-bit dynamic linker b'ld-linux.so.2', # 32-bit dynamic linker -# bitcoin-qt only +# merit-qt only b'libX11-xcb.so.1', # part of X11 b'libX11.so.6', # part of X11 b'libxcb.so.1', # part of X11 diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py index e1924749d..a9e338d77 100755 --- a/contrib/devtools/update-translations.py +++ b/contrib/devtools/update-translations.py @@ -26,7 +26,7 @@ # Name of transifex tool TX = 'tx' # Name of source language file -SOURCE_LANG = 'bitcoin_en.ts' +SOURCE_LANG = 'merit_en.ts' # Directory with locale files LOCALE_DIR = 'src/qt/locale' # Minimum number of messages for translation to be considered at all diff --git a/contrib/docker_build/README.md b/contrib/docker_build/README.md index 72094a077..7cdfe401a 100644 --- a/contrib/docker_build/README.md +++ b/contrib/docker_build/README.md @@ -1,4 +1,4 @@ -Building bitcoind for fun and profit +Building meritd for fun and profit ----- Run the script like this @@ -13,6 +13,6 @@ Building takes about 15-25 minutes with 4 cores (on my PC), most of it downloadi QT gui, tests and benchmarks are all disabled and are not built, since we don't need that. If you want to change that, change `CONFIGFLAGS` in `run_inside.sh`. -Boost is downloaded from my Dropbox instead of sourceforge as in the original bitcoin build, since sourceforge is slow and the download took 1 hour, dominating the total time of the build, for no real reason. If you don't like that, just remove the `boost_download_path` in `run_inside.sh` or change it to your own URL. +Boost is downloaded from my Dropbox instead of sourceforge as in the original merit build, since sourceforge is slow and the download took 1 hour, dominating the total time of the build, for no real reason. If you don't like that, just remove the `boost_download_path` in `run_inside.sh` or change it to your own URL. -The `run_inside.sh` is kinda complicated, but that's because it's copied from [here](https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-descriptors/gitian-linux.yml) :) I don't really understand 50% of it +The `run_inside.sh` is kinda complicated, but that's because it's copied from [here](https://github.com/merit/merit/blob/master/contrib/gitian-descriptors/gitian-linux.yml) :) I don't really understand 50% of it diff --git a/contrib/docker_build/build.sh b/contrib/docker_build/build.sh index d9f2de3fc..94ba13ce9 100755 --- a/contrib/docker_build/build.sh +++ b/contrib/docker_build/build.sh @@ -1,19 +1,19 @@ #!/usr/bin/env bash if [ "x$1" == "x" ] || [ "x$2" == "x" ]; then - echo "./build.sh bitcoin-dir number-of-processes" >&2 + echo "./build.sh merit-dir number-of-processes" >&2 echo " for example: ./build.sh ../ 4" >&2 echo "more processes = faster build, more CPU" >&2 exit 1 fi -BITCOINPATH=`realpath "${1/#\~/$HOME}"` +MERITPATH=`realpath "${1/#\~/$HOME}"` -if [ ! -f $BITCOINPATH/src/bitcoind.cpp ]; then - echo "First parameter doesn't seem like a bitcoin path" >&2 +if [ ! -f $MERITPATH/src/meritd.cpp ]; then + echo "First parameter doesn't seem like a merit path" >&2 echo "" >&2 - echo "./build.sh bitcoin-dir number-of-processes" >&2 + echo "./build.sh merit-dir number-of-processes" >&2 echo " for example: ./build.sh ../ 4" >&2 echo "more processes = faster build, more CPU" >&2 @@ -24,7 +24,7 @@ re='^[0-9]+$' if ! [[ $2 =~ $re ]] ; then echo "Second parameter not a number" >&2 echo "" >&2 - echo "./build.sh bitcoin-dir number-of-processes" >&2 + echo "./build.sh merit-dir number-of-processes" >&2 echo " for example: ./build.sh ../ 4" >&2 echo "more processes = faster build, more CPU" >&2 @@ -33,15 +33,15 @@ fi set -ex -docker build -t bitcoind_build . +docker build -t meritd_build . -docker run -v $BITCOINPATH:/bitcoin bitcoind_build /run.sh $2 +docker run -v $MERITPATH:/merit meritd_build /run.sh $2 -cd $BITCOINPATH/out +cd $MERITPATH/out -# renaming from Bitcoin name to Bitcore name.... stupid thing -rm -f $BITCOINPATH/out/bitcoin-0.14.0-x86_64-linux-gnu-debug.tar.gz -rename s/x86_64-linux-gnu/linux64/ $BITCOINPATH/out/*.tar.gz +# renaming from Merit name to Bitcore name.... stupid thing +rm -f $MERITPATH/out/merit-0.14.0-x86_64-linux-gnu-debug.tar.gz +rename s/x86_64-linux-gnu/linux64/ $MERITPATH/out/*.tar.gz sha256sum *.tar.gz > SHA256SUMS gpg --digest-algo sha256 --clearsign SHA256SUMS diff --git a/contrib/docker_build/run_inside.sh b/contrib/docker_build/run_inside.sh index f543d8fe0..e88ac3282 100644 --- a/contrib/docker_build/run_inside.sh +++ b/contrib/docker_build/run_inside.sh @@ -9,7 +9,7 @@ update-locale LANG=en_US.UTF-8 export LANG='en_US.UTF-8' export LC_ALL='en_US.UTF-8' umask 002 -export OUTDIR=/bitcoin/out +export OUTDIR=/merit/out rm -rf $OUTDIR mkdir $OUTDIR chmod a+rwx $OUTDIR @@ -67,7 +67,7 @@ EOF chmod +x ${WRAP_DIR}/${prog} done -cd bitcoin +cd merit BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -86,13 +86,13 @@ export PATH=${WRAP_DIR}:${PATH} ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist -SOURCEDIST=`echo bitcoin-*.tar.gz` +SOURCEDIST=`echo merit-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST -find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST +find merit-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh index d94c7f4f8..9a674b107 100755 --- a/contrib/gitian-build.sh +++ b/contrib/gitian-build.sh @@ -17,12 +17,12 @@ osx=true SIGNER= VERSION= commit=false -url=https://github.com/bitcoin/bitcoin +url=https://github.com/merit/merit proc=2 mem=2000 lxc=true osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz -osslPatchUrl=https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch +osslPatchUrl=https://meritcore.org/cfields/osslsigncode-Backports-to-1.7.1.patch scriptName=$(basename -- "$0") signProg="gpg --detach-sign" commitFiles=true @@ -31,7 +31,7 @@ commitFiles=true read -d '' usage <<- EOF Usage: $scriptName [-c|u|v|b|s|B|o|h|j|m|] signer version -Run this script from the directory containing the bitcoin, gitian-builder, gitian.sigs, and bitcoin-detached-sigs. +Run this script from the directory containing the merit, gitian-builder, gitian.sigs, and merit-detached-sigs. Arguments: signer GPG signer to sign each build assert file @@ -39,7 +39,7 @@ version Version number, commit, or branch to build. If building a commit or bra Options: -c|--commit Indicate that the version argument is for a commit or branch --u|--url Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin +-u|--url Specify the URL of the repository. Default is https://github.com/merit/merit -v|--verify Verify the Gitian build -b|--build Do a Gitian build -s|--sign Make signed binaries for Windows and Mac OSX @@ -233,7 +233,7 @@ if [[ $setup = true ]] then sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils git clone https://github.com/bitcoin-core/gitian.sigs.git - git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git + git clone https://github.com/bitcoin-core/merit-detached-sigs.git git clone https://github.com/devrandom/gitian-builder.git pushd ./gitian-builder if [[ -n "$USE_LXC" ]] @@ -247,7 +247,7 @@ then fi # Set up build -pushd ./bitcoin +pushd ./merit git fetch git checkout ${COMMIT} popd @@ -256,7 +256,7 @@ popd if [[ $build = true ]] then # Make output folder - mkdir -p ./bitcoin-binaries/${VERSION} + mkdir -p ./merit-binaries/${VERSION} # Build Dependencies echo "" @@ -266,7 +266,7 @@ then mkdir -p inputs wget -N -P inputs $osslPatchUrl wget -N -P inputs $osslTarUrl - make -C ../bitcoin/depends download SOURCES_PATH=`pwd`/cache/common + make -C ../merit/depends download SOURCES_PATH=`pwd`/cache/common # Linux if [[ $linux = true ]] @@ -274,9 +274,9 @@ then echo "" echo "Compiling ${VERSION} Linux" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml - mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit merit=${COMMIT} --url merit=${url} ../merit/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../merit/contrib/gitian-descriptors/gitian-linux.yml + mv build/out/merit-*.tar.gz build/out/src/merit-*.tar.gz ../merit-binaries/${VERSION} fi # Windows if [[ $windows = true ]] @@ -284,10 +284,10 @@ then echo "" echo "Compiling ${VERSION} Windows" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml - mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/bitcoin-win-unsigned.tar.gz - mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../bitcoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit merit=${COMMIT} --url merit=${url} ../merit/contrib/gitian-descriptors/gitian-win.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../merit/contrib/gitian-descriptors/gitian-win.yml + mv build/out/merit-*-win-unsigned.tar.gz inputs/merit-win-unsigned.tar.gz + mv build/out/merit-*.zip build/out/merit-*.exe ../merit-binaries/${VERSION} fi # Mac OSX if [[ $osx = true ]] @@ -295,10 +295,10 @@ then echo "" echo "Compiling ${VERSION} Mac OSX" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit bitcoin=${COMMIT} --url bitcoin=${url} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml - mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz - mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../bitcoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit merit=${COMMIT} --url merit=${url} ../merit/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../merit/contrib/gitian-descriptors/gitian-osx.yml + mv build/out/merit-*-osx-unsigned.tar.gz inputs/merit-osx-unsigned.tar.gz + mv build/out/merit-*.tar.gz build/out/merit-*.dmg ../merit-binaries/${VERSION} fi popd @@ -325,27 +325,27 @@ then echo "" echo "Verifying v${VERSION} Linux" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../merit/contrib/gitian-descriptors/gitian-linux.yml # Windows echo "" echo "Verifying v${VERSION} Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-win.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../merit/contrib/gitian-descriptors/gitian-win.yml # Mac OSX echo "" echo "Verifying v${VERSION} Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../merit/contrib/gitian-descriptors/gitian-osx.yml # Signed Windows echo "" echo "Verifying v${VERSION} Signed Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../merit/contrib/gitian-descriptors/gitian-osx-signer.yml # Signed Mac OSX echo "" echo "Verifying v${VERSION} Signed Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../merit/contrib/gitian-descriptors/gitian-osx-signer.yml popd fi @@ -360,10 +360,10 @@ then echo "" echo "Signing ${VERSION} Windows" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml - mv build/out/bitcoin-*win64-setup.exe ../bitcoin-binaries/${VERSION} - mv build/out/bitcoin-*win32-setup.exe ../bitcoin-binaries/${VERSION} + ./bin/gbuild -i --commit signature=${COMMIT} ../merit/contrib/gitian-descriptors/gitian-win-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../merit/contrib/gitian-descriptors/gitian-win-signer.yml + mv build/out/merit-*win64-setup.exe ../merit-binaries/${VERSION} + mv build/out/merit-*win32-setup.exe ../merit-binaries/${VERSION} fi # Sign Mac OSX if [[ $osx = true ]] @@ -371,9 +371,9 @@ then echo "" echo "Signing ${VERSION} Mac OSX" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml - mv build/out/bitcoin-osx-signed.dmg ../bitcoin-binaries/${VERSION}/bitcoin-${VERSION}-osx.dmg + ./bin/gbuild -i --commit signature=${COMMIT} ../merit/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../merit/contrib/gitian-descriptors/gitian-osx-signer.yml + mv build/out/merit-osx-signed.dmg ../merit-binaries/${VERSION}/merit-${VERSION}-osx.dmg fi popd diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index d9dbfd3cb..b0ee2b494 100644 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -19,7 +19,7 @@ Sanity checks: Once you've got the right hardware and software: - git clone git://github.com/bitcoin/bitcoin.git + git clone git://github.com/merit/merit.git git clone git://github.com/devrandom/gitian-builder.git mkdir gitian-builder/inputs cd gitian-builder/inputs @@ -61,5 +61,5 @@ Here's a description of Gavin's setup on OSX 10.6: 5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above: export USE_LXC=1 - git clone git://github.com/bitcoin/bitcoin.git + git clone git://github.com/merit/merit.git ... etc diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index c80e19edb..e626737b1 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-linux-0.16" +name: "merit-linux-0.16" enable_cache: true suites: - "trusty" @@ -28,8 +28,8 @@ packages: - "ca-certificates" - "python" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/merit/merit.git" + "dir": "merit" files: [] script: | @@ -113,7 +113,7 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - cd bitcoin + cd merit BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -135,13 +135,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 merit-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find merit-* | sort | tar --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 f6e9414ab..5e527284c 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: "merit-dmg-signer" suites: - "trusty" architectures: @@ -7,10 +7,10 @@ architectures: packages: - "faketime" remotes: -- "url": "https://github.com/bitcoin-core/bitcoin-detached-sigs.git" +- "url": "https://github.com/bitcoin-core/merit-detached-sigs.git" "dir": "signature" files: -- "bitcoin-osx-unsigned.tar.gz" +- "merit-osx-unsigned.tar.gz" script: | WRAP_DIR=$HOME/wrapped mkdir -p ${WRAP_DIR} @@ -27,8 +27,8 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=bitcoin-osx-unsigned.tar.gz - SIGNED=bitcoin-osx-signed.dmg + UNSIGNED=merit-osx-unsigned.tar.gz + SIGNED=merit-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 cbf286d2c..7aa27bc43 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-osx-0.16" +name: "merit-osx-0.16" enable_cache: true suites: - "trusty" @@ -28,8 +28,8 @@ packages: - "python-setuptools" - "fonts-tuffy" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/merit/merit.git" + "dir": "merit" files: - "MacOSX10.11.sdk.tar.gz" script: | @@ -83,7 +83,7 @@ script: | create_per-host_faketime_wrappers "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd merit BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs @@ -104,14 +104,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 merit-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find merit-* | sort | tar --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 3c1e0214a..69e015e1b 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: "merit-win-signer" suites: - "trusty" architectures: @@ -8,12 +8,12 @@ packages: - "libssl-dev" - "autoconf" remotes: -- "url": "https://github.com/bitcoin-core/bitcoin-detached-sigs.git" +- "url": "https://github.com/bitcoin-core/merit-detached-sigs.git" "dir": "signature" files: - "osslsigncode-1.7.1.tar.gz" - "osslsigncode-Backports-to-1.7.1.patch" -- "bitcoin-win-unsigned.tar.gz" +- "merit-win-unsigned.tar.gz" script: | BUILD_DIR=`pwd` SIGDIR=${BUILD_DIR}/signature/win @@ -23,7 +23,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 merit-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 104455f4c..729131f3d 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-win-0.16" +name: "merit-win-0.16" enable_cache: true suites: - "trusty" @@ -22,8 +22,8 @@ packages: - "ca-certificates" - "python" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/merit/merit.git" + "dir": "merit" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -101,7 +101,7 @@ script: | create_per-host_linker_wrapper "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd merit BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -119,14 +119,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 merit-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find merit-* | sort | tar --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 @@ -155,7 +155,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 merit-*setup*.exe $OUTDIR/ cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete @@ -171,7 +171,7 @@ script: | cp -rf contrib/windeploy $BUILD_DIR cd $BUILD_DIR/windeploy mkdir unsigned - cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/ + cp $OUTDIR/merit-*setup-unsigned.exe unsigned/ find . | sort | tar --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}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip diff --git a/contrib/init/README.md b/contrib/init/README.md index 1a949f3c0..ef217a372 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 -OS X: org.bitcoin.bitcoind.plist +SystemD: meritd.service +Upstart: meritd.conf +OpenRC: meritd.openrc + meritd.openrcconf +CentOS: meritd.init +OS X: org.merit.meritd.plist ``` have been made available to assist packagers in creating node packages here. diff --git a/contrib/init/meritd.conf b/contrib/init/meritd.conf index de4ea0ed5..3622d0c54 100644 --- a/contrib/init/meritd.conf +++ b/contrib/init/meritd.conf @@ -1,16 +1,16 @@ -description "Bitcoin Core Daemon" +description "Merit 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" +env MERITD_BIN="/usr/bin/meritd" +env MERITD_USER="merit" +env MERITD_GROUP="merit" +env MERITD_PIDDIR="/var/run/meritd" # 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" +env MERITD_PIDFILE="/var/run/meritd/meritd.pid" +env MERITD_CONFIGFILE="/etc/merit/merit.conf" +env MERITD_DATADIR="/var/lib/meritd" expect fork @@ -20,13 +20,13 @@ 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 + # meritd 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" + if ! grep -qs '^rpcpassword=' "$MERITD_CONFIGFILE" ; then + echo "ERROR: You must set a secure rpcpassword to run meritd." + echo "The setting must appear in $MERITD_CONFIGFILE" echo echo "This password is security critical to securing wallets " echo "and must not be the same as the rpcuser setting." @@ -38,28 +38,28 @@ pre-start script 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\"" \ + echo "ie: alertnotify=echo %%s | mail -s \"Merit 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" + mkdir -p "$MERITD_PIDDIR" + chmod 0755 "$MERITD_PIDDIR" + chown $MERITD_USER:$MERITD_GROUP "$MERITD_PIDDIR" + chown $MERITD_USER:$MERITD_GROUP "$MERITD_CONFIGFILE" + chmod 0660 "$MERITD_CONFIGFILE" end script exec start-stop-daemon \ --start \ - --pidfile "$BITCOIND_PIDFILE" \ - --chuid $BITCOIND_USER:$BITCOIND_GROUP \ - --exec "$BITCOIND_BIN" \ + --pidfile "$MERITD_PIDFILE" \ + --chuid $MERITD_USER:$MERITD_GROUP \ + --exec "$MERITD_BIN" \ -- \ - -pid="$BITCOIND_PIDFILE" \ - -conf="$BITCOIND_CONFIGFILE" \ - -datadir="$BITCOIND_DATADIR" \ + -pid="$MERITD_PIDFILE" \ + -conf="$MERITD_CONFIGFILE" \ + -datadir="$MERITD_DATADIR" \ -disablewallet \ -daemon diff --git a/contrib/init/meritd.init b/contrib/init/meritd.init index db5061874..aef62e22d 100644 --- a/contrib/init/meritd.init +++ b/contrib/init/meritd.init @@ -1,36 +1,36 @@ #!/bin/bash # -# bitcoind The bitcoin core server. +# meritd The merit core server. # # # chkconfig: 345 80 20 -# description: bitcoind -# processname: bitcoind +# description: meritd +# processname: meritd # # 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/meritd, see below +if [ -f /etc/sysconfig/meritd ]; then + . /etc/sysconfig/meritd 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=meritd +# you can override the lockfile via MERITD_LOCKFILE in /etc/sysconfig/meritd +lockfile=${MERITD_LOCKFILE-/var/lock/subsys/meritd} -# bitcoind defaults to /usr/bin/bitcoind, override with BITCOIND_BIN -bitcoind=${BITCOIND_BIN-/usr/bin/bitcoind} +# meritd defaults to /usr/bin/meritd, override with MERITD_BIN +meritd=${MERITD_BIN-/usr/bin/meritd} -# bitcoind opts default to -disablewallet, override with BITCOIND_OPTS -bitcoind_opts=${BITCOIND_OPTS--disablewallet} +# meritd opts default to -disablewallet, override with MERITD_OPTS +meritd_opts=${MERITD_OPTS--disablewallet} start() { echo -n $"Starting $prog: " - daemon $DAEMONOPTS $bitcoind $bitcoind_opts + daemon $DAEMONOPTS $meritd $meritd_opts RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/contrib/init/meritd.openrc b/contrib/init/meritd.openrc index 50377c099..08f1c4780 100644 --- a/contrib/init/meritd.openrc +++ b/contrib/init/meritd.openrc @@ -2,41 +2,41 @@ # backward compatibility for existing gentoo layout # -if [ -d "/var/lib/bitcoin/.bitcoin" ]; then - BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoin/.bitcoin" +if [ -d "/var/lib/merit/.merit" ]; then + MERITD_DEFAULT_DATADIR="/var/lib/merit/.merit" else - BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoind" + MERITD_DEFAULT_DATADIR="/var/lib/meritd" 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}}" +MERITD_CONFIGFILE=${MERITD_CONFIGFILE:-/etc/merit/merit.conf} +MERITD_PIDDIR=${MERITD_PIDDIR:-/var/run/meritd} +MERITD_PIDFILE=${MERITD_PIDFILE:-${MERITD_PIDDIR}/meritd.pid} +MERITD_DATADIR=${MERITD_DATADIR:-${MERITD_DEFAULT_DATADIR}} +MERITD_USER=${MERITD_USER:-${MERIT_USER:-merit}} +MERITD_GROUP=${MERITD_GROUP:-merit} +MERITD_BIN=${MERITD_BIN:-/usr/bin/meritd} +MERITD_NICE=${MERITD_NICE:-${NICELEVEL:-0}} +MERITD_OPTS="${MERITD_OPTS:-${MERIT_OPTS}}" -name="Bitcoin Core Daemon" -description="Bitcoin cryptocurrency P2P network daemon" +name="Merit Core Daemon" +description="Merit cryptocurrency P2P network daemon" -command="/usr/bin/bitcoind" -command_args="-pid=\"${BITCOIND_PIDFILE}\" \ - -conf=\"${BITCOIND_CONFIGFILE}\" \ - -datadir=\"${BITCOIND_DATADIR}\" \ +command="/usr/bin/meritd" +command_args="-pid=\"${MERITD_PIDFILE}\" \ + -conf=\"${MERITD_CONFIGFILE}\" \ + -datadir=\"${MERITD_DATADIR}\" \ -daemon \ - ${BITCOIND_OPTS}" + ${MERITD_OPTS}" -required_files="${BITCOIND_CONFIGFILE}" -start_stop_daemon_args="-u ${BITCOIND_USER} \ - -N ${BITCOIND_NICE} -w 2000" -pidfile="${BITCOIND_PIDFILE}" +required_files="${MERITD_CONFIGFILE}" +start_stop_daemon_args="-u ${MERITD_USER} \ + -N ${MERITD_NICE} -w 2000" +pidfile="${MERITD_PIDFILE}" # The retry schedule to use when stopping the daemon. Could be either # a timeout in seconds or multiple signal/timeout pairs (like # "SIGKILL/180 SIGTERM/300") -retry="${BITCOIND_SIGTERM_TIMEOUT}" +retry="${MERITD_SIGTERM_TIMEOUT}" depend() { need localmount net @@ -50,29 +50,29 @@ start_pre() { checkpath \ -d \ --mode 0750 \ - --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ - "${BITCOIND_DATADIR}" + --owner "${MERITD_USER}:${MERITD_GROUP}" \ + "${MERITD_DATADIR}" checkpath \ -d \ --mode 0755 \ - --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ - "${BITCOIND_PIDDIR}" + --owner "${MERITD_USER}:${MERITD_GROUP}" \ + "${MERITD_PIDDIR}" checkpath -f \ - -o ${BITCOIND_USER}:${BITCOIND_GROUP} \ + -o ${MERITD_USER}:${MERITD_GROUP} \ -m 0660 \ - ${BITCOIND_CONFIGFILE} + ${MERITD_CONFIGFILE} checkconfig || return 1 } checkconfig() { - if ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then + if ! grep -qs '^rpcpassword=' "${MERITD_CONFIGFILE}" ; then eerror "" - eerror "ERROR: You must set a secure rpcpassword to run bitcoind." - eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" + eerror "ERROR: You must set a secure rpcpassword to run meritd." + eerror "The setting must appear in ${MERITD_CONFIGFILE}" eerror "" eerror "This password is security critical to securing wallets " eerror "and must not be the same as the rpcuser setting." @@ -84,7 +84,7 @@ checkconfig() 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\"" \ + eerror "ie: alertnotify=echo %%s | mail -s \"Merit Alert\"" \ "admin@foo.com" eerror "" return 1 diff --git a/contrib/init/meritd.openrcconf b/contrib/init/meritd.openrcconf index f70e25cb5..a69ef1091 100644 --- a/contrib/init/meritd.openrcconf +++ b/contrib/init/meritd.openrcconf @@ -1,33 +1,33 @@ -# /etc/conf.d/bitcoind: config file for /etc/init.d/bitcoind +# /etc/conf.d/meritd: config file for /etc/init.d/meritd # Config file location -#BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf" +#MERITD_CONFIGFILE="/etc/merit/merit.conf" -# What directory to write pidfile to? (created and owned by $BITCOIND_USER) -#BITCOIND_PIDDIR="/var/run/bitcoind" +# What directory to write pidfile to? (created and owned by $MERITD_USER) +#MERITD_PIDDIR="/var/run/meritd" # What filename to give the pidfile -#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/bitcoind.pid" +#MERITD_PIDFILE="${MERITD_PIDDIR}/meritd.pid" -# Where to write bitcoind data (be mindful that the blockchain is large) -#BITCOIND_DATADIR="/var/lib/bitcoind" +# Where to write meritd data (be mindful that the blockchain is large) +#MERITD_DATADIR="/var/lib/meritd" -# User and group to own bitcoind process -#BITCOIND_USER="bitcoin" -#BITCOIND_GROUP="bitcoin" +# User and group to own meritd process +#MERITD_USER="merit" +#MERITD_GROUP="merit" -# Path to bitcoind executable -#BITCOIND_BIN="/usr/bin/bitcoind" +# Path to meritd executable +#MERITD_BIN="/usr/bin/meritd" -# Nice value to run bitcoind under -#BITCOIND_NICE=0 +# Nice value to run meritd under +#MERITD_NICE=0 # Additional options (avoid -conf and -datadir, use flags above) -#BITCOIND_OPTS="" +#MERITD_OPTS="" -# The timeout in seconds OpenRC will wait for bitcoind to terminate +# The timeout in seconds OpenRC will wait for meritd 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 +MERITD_SIGTERM_TIMEOUT=60 diff --git a/contrib/init/meritd.service b/contrib/init/meritd.service index 9132957c3..1fba9f1e5 100644 --- a/contrib/init/meritd.service +++ b/contrib/init/meritd.service @@ -1,15 +1,15 @@ [Unit] -Description=Bitcoin's distributed currency daemon +Description=Merit's distributed currency daemon After=network.target [Service] -User=bitcoin -Group=bitcoin +User=merit +Group=merit Type=forking -PIDFile=/var/lib/bitcoind/bitcoind.pid -ExecStart=/usr/bin/bitcoind -daemon -pid=/var/lib/bitcoind/bitcoind.pid \ --conf=/etc/bitcoin/bitcoin.conf -datadir=/var/lib/bitcoind -disablewallet +PIDFile=/var/lib/meritd/meritd.pid +ExecStart=/usr/bin/meritd -daemon -pid=/var/lib/meritd/meritd.pid \ +-conf=/etc/merit/merit.conf -datadir=/var/lib/meritd -disablewallet Restart=always PrivateTmp=true diff --git a/contrib/init/org.merit.meritd.plist b/contrib/init/org.merit.meritd.plist index e94cd4466..1857d55e4 100644 --- a/contrib/init/org.merit.meritd.plist +++ b/contrib/init/org.merit.meritd.plist @@ -3,10 +3,10 @@ Label - org.bitcoin.bitcoind + org.merit.meritd ProgramArguments - /usr/local/bin/bitcoind + /usr/local/bin/meritd -daemon RunAtLoad diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index 298510698..2252fd2e3 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. The scripts +Construct a linear, no-fork, best version of the Merit blockchain. The scripts run using Python 3 but are compatible with Python 2. ## Step 1: Download hash list @@ -21,7 +21,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 `meritd` or `merit-qt -server` will be sufficient. ## Step 2: Copy local block data @@ -39,7 +39,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`: meritd 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 2315898bf..2c2580849 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -1,7 +1,7 @@ -# bitcoind RPC settings (linearize-hashes) +# meritd RPC settings (linearize-hashes) rpcuser=someuser rpcpassword=somepassword -#datadir=~/.bitcoin +#datadir=~/.merit 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/.merit/blocks # testnet #netmagic=0b110907 #genesis=000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943 -#input=/home/example/.bitcoin/testnet3/blocks +#input=/home/example/.merit/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 58fec6ddd..ba5ba04e2 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -27,7 +27,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 MeritRPC: def __init__(self, host, port, username, password): authpair = "%s:%s" % (username, password) authpair = authpair.encode('utf-8') @@ -69,7 +69,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 = MeritRPC(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 6163734e6..59c1104b8 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 `Merit-Core.dmg`. diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index e6ecabace..1ad048ac0 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -28,7 +28,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\x07merit\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, @@ -45,8 +45,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:\x00merituser:\x00Documents:\x00merit:\x00merit:\x00' + package_name_ns + '.temp.dmg' +alias.volume.disk_image_alias.target.posix_path = 'Users/merituser/Documents/merit/merit/' + 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 @@ -54,7 +54,7 @@ ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['Bitcoin-Qt.app']['Iloc'] = (128, 156) +ds['Merit-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 7f017bb4f..08d29c74c 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -6,7 +6,7 @@ set -e ROOTDIR=dist -BUNDLE="${ROOTDIR}/Bitcoin-Qt.app" +BUNDLE="${ROOTDIR}/Merit-Qt.app" CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index ef277a7f1..5e4424a36 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Bitcoin-Qt.app + Merit-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 23a568ad1..e770fb4b9 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -155,7 +155,7 @@ class FrameworkInfo(object): class ApplicationBundleInfo(object): def __init__(self, path): self.path = path - appName = "Bitcoin-Qt" + appName = "Merit-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) @@ -603,7 +603,7 @@ else: # ------------------------------------------------ -target = os.path.join("dist", "Bitcoin-Qt.app") +target = os.path.join("dist", "Merit-Qt.app") if verbose >= 2: print("+ Copying source bundle +") diff --git a/contrib/merit-cli.bash-completion b/contrib/merit-cli.bash-completion index 732981fe7..9df9bf9b9 100644 --- a/contrib/merit-cli.bash-completion +++ b/contrib/merit-cli.bash-completion @@ -1,10 +1,10 @@ -# bash programmable completion for bitcoin-cli(1) +# bash programmable completion for merit-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 $merit-cli for RPC +_merit_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[@]}" "$@" + $merit_cli "${rpcargs[@]}" "$@" } # Add wallet accounts to COMPREPLY -_bitcoin_accounts() { +_merit_accounts() { local accounts - accounts=$(_bitcoin_rpc listaccounts | awk -F '"' '{ print $2 }') + accounts=$(_merit_rpc listaccounts | awk -F '"' '{ print $2 }') COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) ) } -_bitcoin_cli() { +_merit_cli() { local cur prev words=() cword - local bitcoin_cli + local merit_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 merit-cli for -help, help and RPC + # as merit-cli might not be in $PATH + merit_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 + _merit_accounts return 0 ;; getbalance|gettxout|importaddress|importpubkey|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock) @@ -85,7 +85,7 @@ _bitcoin_cli() { return 0 ;; move|setaccount) - _bitcoin_accounts + _merit_accounts return 0 ;; esac @@ -101,7 +101,7 @@ _bitcoin_cli() { return 0 ;; getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany) - _bitcoin_accounts + _merit_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=$($merit_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=$(_merit_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 _merit_cli merit-cli # Local variables: # mode: shell-script diff --git a/contrib/merit-qt.pro b/contrib/merit-qt.pro index b8133bf78..41a0ffeed 100644 --- a/contrib/merit-qt.pro +++ b/contrib/merit-qt.pro @@ -18,4 +18,4 @@ FORMS += \ ../src/qt/forms/transactiondescdialog.ui \ RESOURCES += \ - ../src/qt/bitcoin.qrc + ../src/qt/merit.qrc diff --git a/contrib/merit-tx.bash-completion b/contrib/merit-tx.bash-completion index a83d2979e..fed1e2f19 100644 --- a/contrib/merit-tx.bash-completion +++ b/contrib/merit-tx.bash-completion @@ -1,15 +1,15 @@ -# bash programmable completion for bitcoin-tx(1) +# bash programmable completion for merit-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() { +_merit_tx() { local cur prev words=() cword - local bitcoin_tx + local merit_tx - # save and use original argument to invoke bitcoin-tx for -help + # save and use original argument to invoke merit-tx for -help # it might not be in $PATH - bitcoin_tx="$1" + merit_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 merit-tx -help for options local helpopts - helpopts=$($bitcoin_tx -help | sed -e '/^ -/ p' -e d ) + helpopts=$($merit_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=$($merit_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 _merit_tx merit-tx # Local variables: # mode: shell-script diff --git a/contrib/meritd.bash-completion b/contrib/meritd.bash-completion index cccd4bde0..3b76fa814 100644 --- a/contrib/meritd.bash-completion +++ b/contrib/meritd.bash-completion @@ -1,15 +1,15 @@ -# bash programmable completion for bitcoind(1) and bitcoin-qt(1) +# bash programmable completion for meritd(1) and merit-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() { +_meritd() { local cur prev words=() cword - local bitcoind + local meritd - # save and use original argument to invoke bitcoind for -help + # save and use original argument to invoke meritd for -help # it might not be in $PATH - bitcoind="$1" + meritd="$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=$($meritd -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 _meritd meritd merit-qt # Local variables: # mode: shell-script diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 0ded87c58..eaf87cf21 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 Merit 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 meritd instance running, and another local meritd/merit-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 0d1dd65b4..86b6b945f 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -6,7 +6,7 @@ IF="eth0" #limit of the network interface in question LINKCEIL="1gbit" -#limit outbound Bitcoin protocol traffic to this rate +#limit outbound Merit 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/rpm/README.md b/contrib/rpm/README.md index e1e0745fd..32fe5c7ce 100644 --- a/contrib/rpm/README.md +++ b/contrib/rpm/README.md @@ -1,7 +1,7 @@ RPM Spec File Notes ------------------- -The RPM spec file provided here is for Bitcoin-Core 0.12.0 and builds on CentOS +The RPM spec file provided here is for Merit-Core 0.12.0 and builds on CentOS 7 with either the CentOS provided OpenSSL library or with LibreSSL as packaged at [LibreLAMP.com](https://librelamp.com/). It should hopefully not be too difficult to port the RPM spec file to most RPM based Linux distributions. @@ -19,11 +19,11 @@ reference the release tarball available from https://bitcoin.org/bin/ and `Source1` should reference the BerkeleyDB source. Sources 10-99 are for source files that are maintained in the -[Bitcoin git repository](https://github.com/bitcoin/bitcoin) but are not part of +[Merit git repository](https://github.com/merit/merit) but are not part of the release tarball. Most of these will reside in the `contrib` sub-directory. Sources 10-19 should be reserved for miscellaneous configuration files. -Currently only `Source10` is used, for the example `bitcoin.conf` file. +Currently only `Source10` is used, for the example `merit.conf` file. Sources 20-29 should be reserved for man pages. Currently only `Source20` through `Source23` are used. @@ -34,21 +34,21 @@ release, the full URL specified in the RPM spec file will not work. You can get them from the git repository where you retrieved this file. Sources 100+ are for files that are not source tarballs and are not maintained -in the bitcoin git repository. At present only an SVG version of the Bitcoin +in the merit git repository. At present only an SVG version of the Merit icon is used. ## Patches In general, patches should be avoided. When a packager feels a patch is -necessary, the packager should bring the problem to the attention of the bitcoin +necessary, the packager should bring the problem to the attention of the merit developers so that an official fix to the issue can make it into the next release. -### Patch0 bitcoin-0.12.0-libressl.patch +### Patch0 merit-0.12.0-libressl.patch This patch is only needed if building against LibreSSL. LibreSSL is not the standard TLS library on most Linux distributions. The patch will likely not be -needed when 0.12.1 is released, a proper fix is already in the Bitcoin git +needed when 0.12.1 is released, a proper fix is already in the Merit git master branch. ## BuildRequires @@ -62,7 +62,7 @@ most likely to be the case with the Qt packages. The `build-unix.md` file recommends building against BerkeleyDB 4.8.30. Even if that is the version your Linux distribution ships with, it probably is a good -idea to build Bitcoin Core against a static version of that library compiled +idea to build Merit Core against a static version of that library compiled according to the instructions in the `build-unix.md` file so that any changes the distribution may make in the future will not result in a problem for users. @@ -91,7 +91,7 @@ assigned to them in the `touch` command that specifies the timestamp. ## SVG, PNG, and XPM Icons -The `bitcoin.svg` file is from the source listed as `Source100`. It is used as +The `merit.svg` file is from the source listed as `Source100`. It is used as the source for the PNG and XPM files. The generated PNG and XPM files are given the same timestamp as the source SVG file as a means of indicating they are derived from it. @@ -99,7 +99,7 @@ derived from it. ## Systemd This spec file assumes the target distribution uses systemd. That really only -matters for the `bitcoin-server` package. At this point, most RPM based +matters for the `merit-server` package. At this point, most RPM based distributions that still receive vendor updates do in fact use systemd. The files to control the service are created in the RPM spec file itself using @@ -112,7 +112,7 @@ command that specifies the timestamp. ## SELinux -The `bitcoin-server` package should have SELinux support. How to properly do +The `merit-server` package should have SELinux support. How to properly do that *may* vary by distribution and version of distribution. The SELinux stuff in this RPM spec file *should* be correct for CentOS, RHEL, @@ -137,7 +137,7 @@ want the OpenSSL development files. LibreSSL (and some newer builds of OpenSSL) do not have support for SSLv3. This can cause issues with the Boost package if the Boost package has not been patched accordingly. On those distributions, you will either need to build -Bitcoin-Core against OpenSSL or use a patched version of Boost in the build +Merit-Core against OpenSSL or use a patched version of Boost in the build system. As SSLv3 is no longer safe, distributions that have not patched Boost to work @@ -156,8 +156,8 @@ developed on (CentOS 7). ## Legacy Credit This RPM spec file is largely based upon the work of Michael Hampton at -[Ringing Liberty](https://www.ringingliberty.com/bitcoin/). He has been -packaging Bitcoin for Fedora at least since 2012. +[Ringing Liberty](https://www.ringingliberty.com/merit/). He has been +packaging Merit for Fedora at least since 2012. Most of the differences between his packaging and this package are stylistic in nature. The major differences: @@ -174,9 +174,9 @@ academic. specifying a build without the Qt GUI, or specifying which version of the Qt libraries to use. -4. I renamed the `bitcoin` package that contains the Qt GUI to `bitcoin-core` as +4. I renamed the `merit` package that contains the Qt GUI to `merit-core` as that appears to be how the general population refers to it, in contrast to -`bitcoin-xt` or `bitcoin-classic`. I wanted to make sure the general population +`merit-xt` or `merit-classic`. I wanted to make sure the general population knows what they are getting when installing the GUI package. As far as minor differences, I generally prefer to assign the file permissions diff --git a/contrib/rpm/merit.fc b/contrib/rpm/merit.fc index 6f5eef637..e94ad600d 100644 --- a/contrib/rpm/merit.fc +++ b/contrib/rpm/merit.fc @@ -1,8 +1,8 @@ -/usr/bin/bitcoin-cli -- gen_context(system_u:object_r:bitcoin_exec_t,s0) -/usr/sbin/bitcoind -- gen_context(system_u:object_r:bitcoin_exec_t,s0) -/usr/lib(64)?/bitcoin/bitcoind -- gen_context(system_u:object_r:bitcoin_exec_t,s0) +/usr/bin/merit-cli -- gen_context(system_u:object_r:merit_exec_t,s0) +/usr/sbin/meritd -- gen_context(system_u:object_r:merit_exec_t,s0) +/usr/lib(64)?/merit/meritd -- gen_context(system_u:object_r:merit_exec_t,s0) -/etc/bitcoin(/.*)? gen_context(system_u:object_r:bitcoin_conf_t,s0) -/var/lib/bitcoin(/.*)? gen_context(system_u:object_r:bitcoin_var_lib_t,s0) +/etc/merit(/.*)? gen_context(system_u:object_r:merit_conf_t,s0) +/var/lib/merit(/.*)? gen_context(system_u:object_r:merit_var_lib_t,s0) -(/var)?/run/bitcoind(/.*)? gen_context(system_u:object_r:bitcoin_var_run_t,s0) +(/var)?/run/meritd(/.*)? gen_context(system_u:object_r:merit_var_run_t,s0) diff --git a/contrib/rpm/merit.if b/contrib/rpm/merit.if index b206866cc..fc91f2a82 100644 --- a/contrib/rpm/merit.if +++ b/contrib/rpm/merit.if @@ -1,10 +1,10 @@ -## policy for bitcoin +## policy for merit ######################################## ## -## Transition to bitcoin. +## Transition to merit. ## ## ## @@ -12,19 +12,19 @@ ## ## # -interface(`bitcoin_domtrans',` +interface(`merit_domtrans',` gen_require(` - type bitcoin_t, bitcoin_exec_t; + type merit_t, merit_exec_t; ') corecmd_search_bin($1) - domtrans_pattern($1, bitcoin_exec_t, bitcoin_t) + domtrans_pattern($1, merit_exec_t, merit_t) ') ######################################## ## -## Execute bitcoin server in the bitcoin domain. +## Execute merit server in the merit domain. ## ## ## @@ -32,18 +32,18 @@ interface(`bitcoin_domtrans',` ## ## # -interface(`bitcoin_initrc_domtrans',` +interface(`merit_initrc_domtrans',` gen_require(` - type bitcoin_initrc_exec_t; + type merit_initrc_exec_t; ') - init_labeled_script_domtrans($1, bitcoin_initrc_exec_t) + init_labeled_script_domtrans($1, merit_initrc_exec_t) ') ######################################## ## -## Search bitcoin lib directories. +## Search merit lib directories. ## ## ## @@ -51,18 +51,18 @@ interface(`bitcoin_initrc_domtrans',` ## ## # -interface(`bitcoin_search_lib',` +interface(`merit_search_lib',` gen_require(` - type bitcoin_var_lib_t; + type merit_var_lib_t; ') - allow $1 bitcoin_var_lib_t:dir search_dir_perms; + allow $1 merit_var_lib_t:dir search_dir_perms; files_search_var_lib($1) ') ######################################## ## -## Read bitcoin lib files. +## Read merit lib files. ## ## ## @@ -70,18 +70,18 @@ interface(`bitcoin_search_lib',` ## ## # -interface(`bitcoin_read_lib_files',` +interface(`merit_read_lib_files',` gen_require(` - type bitcoin_var_lib_t; + type merit_var_lib_t; ') files_search_var_lib($1) - read_files_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t) + read_files_pattern($1, merit_var_lib_t, merit_var_lib_t) ') ######################################## ## -## Manage bitcoin lib files. +## Manage merit lib files. ## ## ## @@ -89,18 +89,18 @@ interface(`bitcoin_read_lib_files',` ## ## # -interface(`bitcoin_manage_lib_files',` +interface(`merit_manage_lib_files',` gen_require(` - type bitcoin_var_lib_t; + type merit_var_lib_t; ') files_search_var_lib($1) - manage_files_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t) + manage_files_pattern($1, merit_var_lib_t, merit_var_lib_t) ') ######################################## ## -## Manage bitcoin lib directories. +## Manage merit lib directories. ## ## ## @@ -108,20 +108,20 @@ interface(`bitcoin_manage_lib_files',` ## ## # -interface(`bitcoin_manage_lib_dirs',` +interface(`merit_manage_lib_dirs',` gen_require(` - type bitcoin_var_lib_t; + type merit_var_lib_t; ') files_search_var_lib($1) - manage_dirs_pattern($1, bitcoin_var_lib_t, bitcoin_var_lib_t) + manage_dirs_pattern($1, merit_var_lib_t, merit_var_lib_t) ') ######################################## ## ## All of the rules required to administrate -## a bitcoin environment +## a merit environment ## ## ## @@ -135,23 +135,23 @@ interface(`bitcoin_manage_lib_dirs',` ## ## # -interface(`bitcoin_admin',` +interface(`merit_admin',` gen_require(` - type bitcoin_t; - type bitcoin_initrc_exec_t; - type bitcoin_var_lib_t; + type merit_t; + type merit_initrc_exec_t; + type merit_var_lib_t; ') - allow $1 bitcoin_t:process { ptrace signal_perms }; - ps_process_pattern($1, bitcoin_t) + allow $1 merit_t:process { ptrace signal_perms }; + ps_process_pattern($1, merit_t) - bitcoin_initrc_domtrans($1) + merit_initrc_domtrans($1) domain_system_change_exemption($1) - role_transition $2 bitcoin_initrc_exec_t system_r; + role_transition $2 merit_initrc_exec_t system_r; allow $2 system_r; files_search_var_lib($1) - admin_pattern($1, bitcoin_var_lib_t) + admin_pattern($1, merit_var_lib_t) ') diff --git a/contrib/rpm/merit.spec b/contrib/rpm/merit.spec index 7c4d933ee..7676bb8d3 100644 --- a/contrib/rpm/merit.spec +++ b/contrib/rpm/merit.spec @@ -13,7 +13,7 @@ %endif %endif -Name: bitcoin +Name: merit Version: 0.12.0 Release: 2%{?dist} Summary: Peer to Peer Cryptographic Currency @@ -21,23 +21,23 @@ Summary: Peer to Peer Cryptographic Currency Group: Applications/System License: MIT URL: https://bitcoin.org/ -Source0: https://bitcoin.org/bin/bitcoin-core-%{version}/bitcoin-%{version}.tar.gz +Source0: https://bitcoin.org/bin/merit-core-%{version}/merit-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db-%{bdbv}.NC.tar.gz -Source10: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/examples/bitcoin.conf +Source10: https://raw.githubusercontent.com/merit/merit/v%{version}/contrib/debian/examples/merit.conf #man pages -Source20: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoind.1 -Source21: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoin-cli.1 -Source22: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoin-qt.1 +Source20: https://raw.githubusercontent.com/merit/merit/v%{version}/doc/man/meritd.1 +Source21: https://raw.githubusercontent.com/merit/merit/v%{version}/doc/man/merit-cli.1 +Source22: https://raw.githubusercontent.com/merit/merit/v%{version}/doc/man/merit-qt.1 #selinux -Source30: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.te -# Source31 - what about bitcoin-tx and bench_bitcoin ??? -Source31: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.fc -Source32: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.if +Source30: https://raw.githubusercontent.com/merit/merit/v%{version}/contrib/rpm/merit.te +# Source31 - what about merit-tx and bench_merit ??? +Source31: https://raw.githubusercontent.com/merit/merit/v%{version}/contrib/rpm/merit.fc +Source32: https://raw.githubusercontent.com/merit/merit/v%{version}/contrib/rpm/merit.if -Source100: https://upload.wikimedia.org/wikipedia/commons/4/46/Bitcoin.svg +Source100: https://upload.wikimedia.org/wikipedia/commons/4/46/Merit.svg %if 0%{?_use_libressl:1} BuildRequires: libressl-devel @@ -50,13 +50,13 @@ BuildRequires: autoconf automake libtool BuildRequires: libevent-devel -Patch0: bitcoin-0.12.0-libressl.patch +Patch0: merit-0.12.0-libressl.patch %description -Bitcoin is a digital cryptographic currency that uses peer-to-peer technology to +Merit is a digital cryptographic currency that uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the -issuing of bitcoins is carried out collectively by the network. +issuing of merits is carried out collectively by the network. %if %{_buildqt} %package core @@ -79,42 +79,42 @@ BuildRequires: %{_bindir}/inkscape BuildRequires: %{_bindir}/convert %description core -Bitcoin is a digital cryptographic currency that uses peer-to-peer technology to +Merit is a digital cryptographic currency that uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the -issuing of bitcoins is carried out collectively by the network. +issuing of merits is carried out collectively by the network. This package contains the Qt based graphical client and node. If you are looking -to run a Bitcoin wallet, this is probably the package you want. +to run a Merit wallet, this is probably the package you want. %endif %package libs -Summary: Bitcoin shared libraries +Summary: Merit shared libraries Group: System Environment/Libraries %description libs -This package provides the bitcoinconsensus shared libraries. These libraries +This package provides the meritconsensus shared libraries. These libraries may be used by third party software to provide consensus verification functionality. Unless you know need this package, you probably do not. %package devel -Summary: Development files for bitcoin +Summary: Development files for merit Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel This package contains the header files and static library for the -bitcoinconsensus shared library. If you are developing or compiling software +meritconsensus shared library. If you are developing or compiling software that wants to link against that library, then you need this package installed. Most people do not need this package installed. %package server -Summary: The bitcoin daemon +Summary: The merit daemon Group: System Environment/Daemons -Requires: bitcoin-utils = %{version}-%{release} +Requires: merit-utils = %{version}-%{release} Requires: selinux-policy policycoreutils-python Requires(pre): shadow-utils Requires(post): %{_sbindir}/semodule %{_sbindir}/restorecon %{_sbindir}/fixfiles %{_sbindir}/sestatus @@ -124,34 +124,34 @@ BuildRequires: checkpolicy BuildRequires: %{_datadir}/selinux/devel/Makefile %description server -This package provides a stand-alone bitcoin-core daemon. For most users, this +This package provides a stand-alone merit-core daemon. For most users, this package is only needed if they need a full-node without the graphical client. Some third party wallet software will want this package to provide the actual -bitcoin-core node they use to connect to the network. +merit-core node they use to connect to the network. -If you use the graphical bitcoin-core client then you almost certainly do not +If you use the graphical merit-core client then you almost certainly do not need this package. %package utils -Summary: Bitcoin utilities +Summary: Merit utilities Group: Applications/System %description utils This package provides several command line utilities for interacting with a -bitcoin-core daemon. +merit-core daemon. -The bitcoin-cli utility allows you to communicate and control a bitcoin daemon -over RPC, the bitcoin-tx utility allows you to create a custom transaction, and -the bench_bitcoin utility can be used to perform some benchmarks. +The merit-cli utility allows you to communicate and control a merit daemon +over RPC, the merit-tx utility allows you to create a custom transaction, and +the bench_merit utility can be used to perform some benchmarks. -This package contains utilities needed by the bitcoin-server package. +This package contains utilities needed by the merit-server package. %prep %setup -q %patch0 -p1 -b .libressl -cp -p %{SOURCE10} ./bitcoin.conf.example +cp -p %{SOURCE10} ./merit.conf.example tar -zxf %{SOURCE1} cp -p db-%{bdbv}.NC/LICENSE ./db-%{bdbv}.NC-LICENSE mkdir db4 SELinux @@ -172,7 +172,7 @@ make %{?_smp_mflags} pushd SELinux for selinuxvariant in %{selinux_variants}; do make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile - mv bitcoin.pp bitcoin.pp.${selinuxvariant} + mv merit.pp merit.pp.${selinuxvariant} make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile clean done popd @@ -182,42 +182,42 @@ popd make install DESTDIR=%{buildroot} mkdir -p -m755 %{buildroot}%{_sbindir} -mv %{buildroot}%{_bindir}/bitcoind %{buildroot}%{_sbindir}/bitcoind +mv %{buildroot}%{_bindir}/meritd %{buildroot}%{_sbindir}/meritd # systemd stuff mkdir -p %{buildroot}%{_tmpfilesdir} -cat < %{buildroot}%{_tmpfilesdir}/bitcoin.conf -d /run/bitcoind 0750 bitcoin bitcoin - +cat < %{buildroot}%{_tmpfilesdir}/merit.conf +d /run/meritd 0750 merit merit - EOF -touch -a -m -t 201504280000 %{buildroot}%{_tmpfilesdir}/bitcoin.conf +touch -a -m -t 201504280000 %{buildroot}%{_tmpfilesdir}/merit.conf mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -cat < %{buildroot}%{_sysconfdir}/sysconfig/bitcoin -# Provide options to the bitcoin daemon here, for example +cat < %{buildroot}%{_sysconfdir}/sysconfig/merit +# Provide options to the merit daemon here, for example # OPTIONS="-testnet -disable-wallet" OPTIONS="" # System service defaults. # Don't change these unless you know what you're doing. -CONFIG_FILE="%{_sysconfdir}/bitcoin/bitcoin.conf" -DATA_DIR="%{_localstatedir}/lib/bitcoin" -PID_FILE="/run/bitcoind/bitcoind.pid" +CONFIG_FILE="%{_sysconfdir}/merit/merit.conf" +DATA_DIR="%{_localstatedir}/lib/merit" +PID_FILE="/run/meritd/meritd.pid" EOF -touch -a -m -t 201504280000 %{buildroot}%{_sysconfdir}/sysconfig/bitcoin +touch -a -m -t 201504280000 %{buildroot}%{_sysconfdir}/sysconfig/merit mkdir -p %{buildroot}%{_unitdir} -cat < %{buildroot}%{_unitdir}/bitcoin.service +cat < %{buildroot}%{_unitdir}/merit.service [Unit] -Description=Bitcoin daemon +Description=Merit daemon After=syslog.target network.target [Service] Type=forking -ExecStart=%{_sbindir}/bitcoind -daemon -conf=\${CONFIG_FILE} -datadir=\${DATA_DIR} -pid=\${PID_FILE} \$OPTIONS -EnvironmentFile=%{_sysconfdir}/sysconfig/bitcoin -User=bitcoin -Group=bitcoin +ExecStart=%{_sbindir}/meritd -daemon -conf=\${CONFIG_FILE} -datadir=\${DATA_DIR} -pid=\${PID_FILE} \$OPTIONS +EnvironmentFile=%{_sysconfdir}/sysconfig/merit +User=merit +Group=merit Restart=on-failure PrivateTmp=true @@ -229,63 +229,63 @@ StartLimitBurst=5 [Install] WantedBy=multi-user.target EOF -touch -a -m -t 201504280000 %{buildroot}%{_unitdir}/bitcoin.service +touch -a -m -t 201504280000 %{buildroot}%{_unitdir}/merit.service #end systemd stuff -mkdir %{buildroot}%{_sysconfdir}/bitcoin -mkdir -p %{buildroot}%{_localstatedir}/lib/bitcoin +mkdir %{buildroot}%{_sysconfdir}/merit +mkdir -p %{buildroot}%{_localstatedir}/lib/merit #SELinux for selinuxvariant in %{selinux_variants}; do install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 SELinux/bitcoin.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/bitcoin.pp + install -p -m 644 SELinux/merit.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/merit.pp done %if %{_buildqt} # qt icons -install -D -p share/pixmaps/bitcoin.ico %{buildroot}%{_datadir}/pixmaps/bitcoin.ico +install -D -p share/pixmaps/merit.ico %{buildroot}%{_datadir}/pixmaps/merit.ico install -p share/pixmaps/nsis-header.bmp %{buildroot}%{_datadir}/pixmaps/ install -p share/pixmaps/nsis-wizard.bmp %{buildroot}%{_datadir}/pixmaps/ -install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/bitcoin.svg -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin16.png -w16 -h16 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin32.png -w32 -h32 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin64.png -w64 -h64 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin128.png -w128 -h128 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin256.png -w256 -h256 -%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin16.xpm -%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin32.xpm -%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin64.xpm -%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin128.xpm -%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin256.xpm +install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/merit.svg +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/merit16.png -w16 -h16 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/merit32.png -w32 -h32 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/merit64.png -w64 -h64 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/merit128.png -w128 -h128 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/merit256.png -w256 -h256 +%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/merit256.png %{buildroot}%{_datadir}/pixmaps/merit16.xpm +%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/merit256.png %{buildroot}%{_datadir}/pixmaps/merit32.xpm +%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/merit256.png %{buildroot}%{_datadir}/pixmaps/merit64.xpm +%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/merit256.png %{buildroot}%{_datadir}/pixmaps/merit128.xpm +%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/merit256.png %{buildroot}%{_datadir}/pixmaps/merit256.xpm touch %{buildroot}%{_datadir}/pixmaps/*.png -r %{SOURCE100} touch %{buildroot}%{_datadir}/pixmaps/*.xpm -r %{SOURCE100} # Desktop File - change the touch timestamp if modifying mkdir -p %{buildroot}%{_datadir}/applications -cat < %{buildroot}%{_datadir}/applications/bitcoin-core.desktop +cat < %{buildroot}%{_datadir}/applications/merit-core.desktop [Desktop Entry] Encoding=UTF-8 -Name=Bitcoin -Comment=Bitcoin P2P Cryptocurrency -Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair -Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi -Exec=bitcoin-qt %u +Name=Merit +Comment=Merit P2P Cryptocurrency +Comment[fr]=Merit, monnaie virtuelle cryptographique pair à pair +Comment[tr]=Merit, eşten eşe kriptografik sanal para birimi +Exec=merit-qt %u Terminal=false Type=Application -Icon=bitcoin128 -MimeType=x-scheme-handler/bitcoin; +Icon=merit128 +MimeType=x-scheme-handler/merit; Categories=Office;Finance; EOF # change touch date when modifying desktop -touch -a -m -t 201511100546 %{buildroot}%{_datadir}/applications/bitcoin-core.desktop -%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/bitcoin-core.desktop +touch -a -m -t 201511100546 %{buildroot}%{_datadir}/applications/merit-core.desktop +%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/merit-core.desktop # KDE protocol - change the touch timestamp if modifying mkdir -p %{buildroot}%{_datadir}/kde4/services -cat < %{buildroot}%{_datadir}/kde4/services/bitcoin-core.protocol +cat < %{buildroot}%{_datadir}/kde4/services/merit-core.protocol [Protocol] -exec=bitcoin-qt '%u' -protocol=bitcoin +exec=merit-qt '%u' +protocol=merit input=none output=none helper=true @@ -296,14 +296,14 @@ makedir=false deleting=false EOF # change touch date when modifying protocol -touch -a -m -t 201511100546 %{buildroot}%{_datadir}/kde4/services/bitcoin-core.protocol +touch -a -m -t 201511100546 %{buildroot}%{_datadir}/kde4/services/merit-core.protocol %endif # man pages -install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/bitcoind.1 -install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/bitcoin-cli.1 +install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/meritd.1 +install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/merit-cli.1 %if %{_buildqt} -install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/bitcoin-qt.1 +install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/merit-qt.1 %endif # nuke these, we do extensive testing of binaries in %%check before packaging @@ -311,7 +311,7 @@ rm -f %{buildroot}%{_bindir}/test_* %check make check -srcdir=src test/bitcoin-util-test.py +srcdir=src test/merit-util-test.py test/functional/test_runner.py --extended %post libs -p /sbin/ldconfig @@ -319,37 +319,37 @@ test/functional/test_runner.py --extended %postun libs -p /sbin/ldconfig %pre server -getent group bitcoin >/dev/null || groupadd -r bitcoin -getent passwd bitcoin >/dev/null || - useradd -r -g bitcoin -d /var/lib/bitcoin -s /sbin/nologin \ - -c "Bitcoin wallet server" bitcoin +getent group merit >/dev/null || groupadd -r merit +getent passwd merit >/dev/null || + useradd -r -g merit -d /var/lib/merit -s /sbin/nologin \ + -c "Merit wallet server" merit exit 0 %post server -%systemd_post bitcoin.service +%systemd_post merit.service # SELinux if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then for selinuxvariant in %{selinux_variants}; do - %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/bitcoin.pp &> /dev/null || : + %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/merit.pp &> /dev/null || : done -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8332 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8333 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18332 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18333 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18443 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18444 -%{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || : -%{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || : +%{_sbindir}/semanage port -a -t merit_port_t -p tcp 8332 +%{_sbindir}/semanage port -a -t merit_port_t -p tcp 8333 +%{_sbindir}/semanage port -a -t merit_port_t -p tcp 18332 +%{_sbindir}/semanage port -a -t merit_port_t -p tcp 18333 +%{_sbindir}/semanage port -a -t merit_port_t -p tcp 18443 +%{_sbindir}/semanage port -a -t merit_port_t -p tcp 18444 +%{_sbindir}/fixfiles -R merit-server restore &> /dev/null || : +%{_sbindir}/restorecon -R %{_localstatedir}/lib/merit || : fi %posttrans server %{_bindir}/systemd-tmpfiles --create %preun server -%systemd_preun bitcoin.service +%systemd_preun merit.service %postun server -%systemd_postun bitcoin.service +%systemd_postun merit.service # SELinux if [ $1 -eq 0 ]; then if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then @@ -360,11 +360,11 @@ if [ $1 -eq 0 ]; then %{_sbindir}/semanage port -d -p tcp 18443 %{_sbindir}/semanage port -d -p tcp 18444 for selinuxvariant in %{selinux_variants}; do - %{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || : + %{_sbindir}/semodule -s ${selinuxvariant} -r merit &> /dev/null || : done - %{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || : - [ -d %{_localstatedir}/lib/bitcoin ] && \ - %{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin &> /dev/null || : + %{_sbindir}/fixfiles -R merit-server restore &> /dev/null || : + [ -d %{_localstatedir}/lib/merit ] && \ + %{_sbindir}/restorecon -R %{_localstatedir}/lib/merit &> /dev/null || : fi fi @@ -375,16 +375,16 @@ rm -rf %{buildroot} %files core %defattr(-,root,root,-) %license COPYING db-%{bdbv}.NC-LICENSE -%doc COPYING bitcoin.conf.example doc/README.md doc/bips.md doc/files.md doc/multiwallet-qt.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md -%attr(0755,root,root) %{_bindir}/bitcoin-qt -%attr(0644,root,root) %{_datadir}/applications/bitcoin-core.desktop -%attr(0644,root,root) %{_datadir}/kde4/services/bitcoin-core.protocol +%doc COPYING merit.conf.example doc/README.md doc/bips.md doc/files.md doc/multiwallet-qt.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md +%attr(0755,root,root) %{_bindir}/merit-qt +%attr(0644,root,root) %{_datadir}/applications/merit-core.desktop +%attr(0644,root,root) %{_datadir}/kde4/services/merit-core.protocol %attr(0644,root,root) %{_datadir}/pixmaps/*.ico %attr(0644,root,root) %{_datadir}/pixmaps/*.bmp %attr(0644,root,root) %{_datadir}/pixmaps/*.svg %attr(0644,root,root) %{_datadir}/pixmaps/*.png %attr(0644,root,root) %{_datadir}/pixmaps/*.xpm -%attr(0644,root,root) %{_mandir}/man1/bitcoin-qt.1* +%attr(0644,root,root) %{_mandir}/man1/merit-qt.1* %endif %files libs @@ -406,30 +406,30 @@ rm -rf %{buildroot} %files server %defattr(-,root,root,-) %license COPYING db-%{bdbv}.NC-LICENSE -%doc COPYING bitcoin.conf.example doc/README.md doc/REST-interface.md doc/bips.md doc/dnsseed-policy.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md -%attr(0755,root,root) %{_sbindir}/bitcoind -%attr(0644,root,root) %{_tmpfilesdir}/bitcoin.conf -%attr(0644,root,root) %{_unitdir}/bitcoin.service -%dir %attr(0750,bitcoin,bitcoin) %{_sysconfdir}/bitcoin -%dir %attr(0750,bitcoin,bitcoin) %{_localstatedir}/lib/bitcoin -%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/bitcoin +%doc COPYING merit.conf.example doc/README.md doc/REST-interface.md doc/bips.md doc/dnsseed-policy.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md +%attr(0755,root,root) %{_sbindir}/meritd +%attr(0644,root,root) %{_tmpfilesdir}/merit.conf +%attr(0644,root,root) %{_unitdir}/merit.service +%dir %attr(0750,merit,merit) %{_sysconfdir}/merit +%dir %attr(0750,merit,merit) %{_localstatedir}/lib/merit +%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/merit %attr(0644,root,root) %{_datadir}/selinux/*/*.pp -%attr(0644,root,root) %{_mandir}/man1/bitcoind.1* +%attr(0644,root,root) %{_mandir}/man1/meritd.1* %files utils %defattr(-,root,root,-) %license COPYING -%doc COPYING bitcoin.conf.example doc/README.md -%attr(0755,root,root) %{_bindir}/bitcoin-cli -%attr(0755,root,root) %{_bindir}/bitcoin-tx -%attr(0755,root,root) %{_bindir}/bench_bitcoin -%attr(0644,root,root) %{_mandir}/man1/bitcoin-cli.1* +%doc COPYING merit.conf.example doc/README.md +%attr(0755,root,root) %{_bindir}/merit-cli +%attr(0755,root,root) %{_bindir}/merit-tx +%attr(0755,root,root) %{_bindir}/bench_merit +%attr(0644,root,root) %{_mandir}/man1/merit-cli.1* %changelog * Fri Feb 26 2016 Alice Wonder - 0.12.0-2 -- Rename Qt package from bitcoin to bitcoin-core +- Rename Qt package from merit to merit-core - Make building of the Qt package optional - When building the Qt package, default to Qt5 but allow building - against Qt4 @@ -439,4 +439,4 @@ rm -rf %{buildroot} - Initial spec file for 0.12.0 release # This spec file is written from scratch but a lot of the packaging decisions are directly -# based upon the 0.11.2 package spec file from https://www.ringingliberty.com/bitcoin/ +# based upon the 0.11.2 package spec file from https://www.ringingliberty.com/merit/ diff --git a/contrib/rpm/merit.te b/contrib/rpm/merit.te index d6231c591..b7efe54d4 100644 --- a/contrib/rpm/merit.te +++ b/contrib/rpm/merit.te @@ -1,81 +1,81 @@ -policy_module(bitcoin, 1.100.1) +policy_module(merit, 1.100.1) ######################################## # # Declarations # -type bitcoin_t; -type bitcoin_exec_t; -init_daemon_domain(bitcoin_t, bitcoin_exec_t) +type merit_t; +type merit_exec_t; +init_daemon_domain(merit_t, merit_exec_t) -permissive bitcoin_t; +permissive merit_t; -type bitcoin_initrc_exec_t; -init_script_file(bitcoin_initrc_exec_t) +type merit_initrc_exec_t; +init_script_file(merit_initrc_exec_t) -type bitcoin_conf_t; -files_type(bitcoin_conf_t) +type merit_conf_t; +files_type(merit_conf_t) -type bitcoin_var_lib_t; -files_type(bitcoin_var_lib_t) +type merit_var_lib_t; +files_type(merit_var_lib_t) -type bitcoin_var_run_t; -files_type(bitcoin_var_run_t) +type merit_var_run_t; +files_type(merit_var_run_t) -type bitcoin_port_t; -corenet_port(bitcoin_port_t) +type merit_port_t; +corenet_port(merit_port_t) ######################################## # -# bitcoin local policy +# merit local policy # -allow bitcoin_t self:process { fork }; +allow merit_t self:process { fork }; -allow bitcoin_t self:fifo_file rw_fifo_file_perms; -allow bitcoin_t self:unix_stream_socket create_stream_socket_perms; +allow merit_t self:fifo_file rw_fifo_file_perms; +allow merit_t self:unix_stream_socket create_stream_socket_perms; -manage_dirs_pattern(bitcoin_t, bitcoin_conf_t, bitcoin_conf_t) -manage_files_pattern(bitcoin_t, bitcoin_conf_t, bitcoin_conf_t) +manage_dirs_pattern(merit_t, merit_conf_t, merit_conf_t) +manage_files_pattern(merit_t, merit_conf_t, merit_conf_t) -manage_dirs_pattern(bitcoin_t, bitcoin_var_lib_t, bitcoin_var_lib_t) -manage_files_pattern(bitcoin_t, bitcoin_var_lib_t, bitcoin_var_lib_t) -files_var_lib_filetrans(bitcoin_t, bitcoin_var_lib_t, { dir file }) +manage_dirs_pattern(merit_t, merit_var_lib_t, merit_var_lib_t) +manage_files_pattern(merit_t, merit_var_lib_t, merit_var_lib_t) +files_var_lib_filetrans(merit_t, merit_var_lib_t, { dir file }) -manage_dirs_pattern(bitcoin_t, bitcoin_var_run_t, bitcoin_var_run_t) -manage_files_pattern(bitcoin_t, bitcoin_var_run_t, bitcoin_var_run_t) +manage_dirs_pattern(merit_t, merit_var_run_t, merit_var_run_t) +manage_files_pattern(merit_t, merit_var_run_t, merit_var_run_t) -sysnet_dns_name_resolve(bitcoin_t) -corenet_all_recvfrom_unlabeled(bitcoin_t) +sysnet_dns_name_resolve(merit_t) +corenet_all_recvfrom_unlabeled(merit_t) -allow bitcoin_t self:tcp_socket create_stream_socket_perms; -corenet_tcp_sendrecv_generic_if(bitcoin_t) -corenet_tcp_sendrecv_generic_node(bitcoin_t) -corenet_tcp_sendrecv_all_ports(bitcoin_t) -corenet_tcp_bind_generic_node(bitcoin_t) +allow merit_t self:tcp_socket create_stream_socket_perms; +corenet_tcp_sendrecv_generic_if(merit_t) +corenet_tcp_sendrecv_generic_node(merit_t) +corenet_tcp_sendrecv_all_ports(merit_t) +corenet_tcp_bind_generic_node(merit_t) gen_require(` - type bitcoin_port_t; + type merit_port_t; ') -allow bitcoin_t bitcoin_port_t:tcp_socket name_bind; +allow merit_t merit_port_t:tcp_socket name_bind; gen_require(` - type bitcoin_port_t; + type merit_port_t; ') -allow bitcoin_t bitcoin_port_t:tcp_socket name_connect; +allow merit_t merit_port_t:tcp_socket name_connect; -domain_use_interactive_fds(bitcoin_t) +domain_use_interactive_fds(merit_t) -files_read_etc_files(bitcoin_t) +files_read_etc_files(merit_t) -miscfiles_read_localization(bitcoin_t) +miscfiles_read_localization(merit_t) -sysnet_dns_name_resolve(bitcoin_t) +sysnet_dns_name_resolve(merit_t) -allow bitcoin_t bitcoin_exec_t:file execute_no_trans; -allow bitcoin_t self:process setsched; -corecmd_exec_ls(bitcoin_t) -corenet_tcp_connect_http_port(bitcoin_t) -dev_read_urand(bitcoin_t) -fs_getattr_xattr_fs(bitcoin_t) -kernel_read_system_state(bitcoin_t) +allow merit_t merit_exec_t:file execute_no_trans; +allow merit_t self:process setsched; +corecmd_exec_ls(merit_t) +corenet_tcp_connect_http_port(merit_t) +dev_read_urand(merit_t) +fs_getattr_xattr_fs(merit_t) +kernel_read_system_state(merit_t) diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md index 139c03181..9f7b9adb8 100644 --- a/contrib/seeds/README.md +++ b/contrib/seeds/README.md @@ -8,7 +8,7 @@ and remove old versions as necessary. The seeds compiled into the release are created from sipa's DNS seed data, like this: - curl -s http://bitcoin.sipa.be/seeds.txt.gz | gzip -dc > seeds_main.txt + curl -s http://merit.sipa.be/seeds.txt.gz | gzip -dc > seeds_main.txt python3 makeseeds.py < seeds_main.txt > nodes_main.txt python3 generate-seeds.py . > ../../src/chainparamsseeds.h diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index 28068a752..f449be91e 100755 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -117,10 +117,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 MERIT_CHAINPARAMSSEEDS_H\n') + g.write('#define MERIT_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 merit 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') @@ -131,7 +131,7 @@ def main(): g.write('\n') with open(os.path.join(indir,'nodes_test.txt'),'r') as f: process_nodes(g, f, 'pnSeed6_test', 18333) - g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') + g.write('#endif // MERIT_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': main() diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 877a7836e..93c3f6d44 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -155,7 +155,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 merit 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/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt index 98365ee50..13dff6810 100644 --- a/contrib/seeds/nodes_test.txt +++ b/contrib/seeds/nodes_test.txt @@ -1,7 +1,7 @@ # List of fixed seed nodes for testnet # Onion nodes -thfsmmn2jbitcoin.onion +thfsmmn2jmerit.onion it2pj4f7657g3rhi.onion nkf5e6b7pl4jfd4a.onion 4zhkir2ofl7orfom.onion diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index 83624f443..81abd45b0 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -1,8 +1,8 @@ ### TestGen ### -Utilities to generate test vectors for the data-driven Bitcoin tests. +Utilities to generate test vectors for the data-driven Merit tests. Usage: gen_base58_test_vectors.py valid 50 > ../../src/test/data/base58_keys_valid.json - gen_base58_test_vectors.py invalid 50 > ../../src/test/data/base58_keys_invalid.json \ No newline at end of file + gen_base58_test_vectors.py invalid 50 > ../../src/test/data/base58_keys_invalid.json diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py index 0d09692b3..e005b0943 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. +Merit base58 encoding and decoding. Based on https://bitcointalk.org/index.php?topic=1026.0 (public domain) ''' @@ -37,7 +37,7 @@ def b58encode(v): long_value = div result = __b58chars[long_value] + result - # Bitcoin does a little leading-zero-compression: + # Merit does a little leading-zero-compression: # leading 0-bytes in the input become leading-1s nPad = 0 for c in v: @@ -97,7 +97,7 @@ def get_bcaddress_version(strAddress): return ord(version) if __name__ == '__main__': - # Test case (from http://gitorious.org/bitcoin/python-base58.git) + # Test case (from http://gitorious.org/merit/python-base58.git) assert get_bcaddress_version('15VjRaDX9zpbA8LVnbrCAFzrVzN7ixHNsC') is 0 _ohai = 'o hai'.encode('ascii') _tmp = b58encode(_ohai) diff --git a/contrib/tidy_datadir.sh b/contrib/tidy_datadir.sh index 8960f8811..df07fb0f1 100755 --- a/contrib/tidy_datadir.sh +++ b/contrib/tidy_datadir.sh @@ -7,7 +7,7 @@ if [ -d "$1" ]; then cd "$1" else echo "Usage: $0 " >&2 - echo "Removes obsolete Bitcoin database files" >&2 + echo "Removes obsolete Merit database files" >&2 exit 1 fi @@ -19,22 +19,22 @@ if [ -f wallet.dat -a -f peers.dat -a -f chainstate/CURRENT -a -f blocks/index/C case $LEVEL in 0) - echo "Error: no Bitcoin datadir detected." + echo "Error: no Merit datadir detected." exit 1 ;; 1) - echo "Detected old Bitcoin datadir (before 0.7)." + echo "Detected old Merit datadir (before 0.7)." echo "Nothing to do." exit 0 ;; 2) - echo "Detected Bitcoin 0.7 datadir." + echo "Detected Merit 0.7 datadir." ;; 3) - echo "Detected Bitcoin pre-0.8 datadir." + echo "Detected Merit pre-0.8 datadir." ;; 4) - echo "Detected Bitcoin 0.8 datadir." + echo "Detected Merit 0.8 datadir." ;; esac diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh index b01e2a6d3..fdffe4c28 100755 --- a/contrib/verify-commits/gpg.sh +++ b/contrib/verify-commits/gpg.sh @@ -8,7 +8,7 @@ VALID=false REVSIG=false IFS=' ' -if [ "$BITCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then +if [ "$MERIT_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then GPG_RES="$(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)" else # Note how we've disabled SHA1 with the --weak-digest option, disabling @@ -42,7 +42,7 @@ for LINE in $(echo "$GPG_RES"); do done < ./contrib/verify-commits/trusted-keys ;; "[GNUPG:] REVKEYSIG "*) - [ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1 + [ "$MERIT_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1 REVSIG=true GOODREVSIG="[GNUPG:] GOODSIG ${LINE#* * *}" ;; diff --git a/contrib/verify-commits/pre-push-hook.sh b/contrib/verify-commits/pre-push-hook.sh index c21febb9e..0ac6ae71a 100755 --- a/contrib/verify-commits/pre-push-hook.sh +++ b/contrib/verify-commits/pre-push-hook.sh @@ -3,7 +3,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)bitcoin/bitcoin(.git)?$ ]]; then +if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)merit/merit(.git)?$ ]]; then exit 0 fi diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh index 74b7f3837..c8346a554 100755 --- a/contrib/verify-commits/verify-commits.sh +++ b/contrib/verify-commits/verify-commits.sh @@ -51,15 +51,15 @@ while true; do fi if [ "$NO_SHA1" = "1" ]; then - export BITCOIN_VERIFY_COMMITS_ALLOW_SHA1=0 + export MERIT_VERIFY_COMMITS_ALLOW_SHA1=0 else - export BITCOIN_VERIFY_COMMITS_ALLOW_SHA1=1 + export MERIT_VERIFY_COMMITS_ALLOW_SHA1=1 fi if [ "${REVSIG_ALLOWED#*$CURRENT_COMMIT}" != "$REVSIG_ALLOWED" ]; then - export BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG=1 + export MERIT_VERIFY_COMMITS_ALLOW_REVSIG=1 else - export BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG=0 + export MERIT_VERIFY_COMMITS_ALLOW_REVSIG=0 fi if ! git -c "gpg.program=${DIR}/gpg.sh" verify-commit "$CURRENT_COMMIT" > /dev/null; then diff --git a/contrib/verifybinaries/README.md b/contrib/verifybinaries/README.md index 3ffe0a2f2..ecbb59641 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 "Merit Core binary release signing key" pub 4096R/36C2E964 2015-06-24 [expires: 2017-02-13] 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 (Merit 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 merit-core-0.11.2 +./verify.sh merit-core-0.12.0 +./verify.sh merit-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 merit-core-0.11.2-osx ./verify.sh 0.12.0-linux -./verify.sh bitcoin-core-0.13.0-rc3-win64 +./verify.sh merit-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 merit-core-0.13.0 delete ``` diff --git a/contrib/verifybinaries/verify.sh b/contrib/verifybinaries/verify.sh index 409f517c9..fab58f951 100755 --- a/contrib/verifybinaries/verify.sh +++ b/contrib/verifybinaries/verify.sh @@ -4,7 +4,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. ### This script attempts to download the signature file SHA256SUMS.asc from -### bitcoincore.org and bitcoin.org and compares them. +### meritcore.org and bitcoin.org and compares them. ### It first checks if the signature passes, and then downloads the files specified in ### the file, and checks if the hashes of these files match those that are specified ### in the signature file. @@ -18,15 +18,15 @@ function clean_up { done } -WORKINGDIR="/tmp/bitcoin_verify_binaries" +WORKINGDIR="/tmp/merit_verify_binaries" TMPFILE="hashes.tmp" SIGNATUREFILENAME="SHA256SUMS.asc" RCSUBDIR="test" -HOST1="https://bitcoincore.org" +HOST1="https://meritcore.org" HOST2="https://bitcoin.org" BASEDIR="/bin/" -VERSIONPREFIX="bitcoin-core-" +VERSIONPREFIX="merit-core-" RCVERSIONSTRING="rc" if [ ! -d "$WORKINGDIR" ]; then @@ -37,7 +37,7 @@ cd "$WORKINGDIR" #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 'merit-', # and add this prefix if it doesn't if [[ $1 == "$VERSIONPREFIX"* ]]; then VERSION="$1" @@ -97,7 +97,7 @@ fi WGETOUT=$(wget -N -O "$SIGNATUREFILENAME.2" "$HOST2$BASEDIR$SIGNATUREFILENAME" 2>&1) if [ $? -ne 0 ]; then - echo "bitcoin.org failed to provide signature file, but bitcoincore.org did?" + echo "bitcoin.org failed to provide signature file, but meritcore.org did?" echo "wget output:" echo "$WGETOUT"|sed 's/^/\t/g' clean_up $SIGNATUREFILENAME @@ -106,7 +106,7 @@ fi SIGFILEDIFFS="$(diff $SIGNATUREFILENAME $SIGNATUREFILENAME.2)" if [ "$SIGFILEDIFFS" != "" ]; then - echo "bitcoin.org and bitcoincore.org signature files were not equal?" + echo "bitcoin.org and meritcore.org signature files were not equal?" clean_up $SIGNATUREFILENAME $SIGNATUREFILENAME.2 exit 4 fi @@ -125,7 +125,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 Merit 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 5cc19761d..088ea1cfb 100755 --- 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 \ + Merit should be started with the command line arguments: + meritd -testnet -daemon \ -zmqpubhashblock=tcp://127.0.0.1:28332 \ -zmqpubrawtx=tcp://127.0.0.1:28332 \ -zmqpubhashtx=tcp://127.0.0.1:28332 \ @@ -19,7 +19,7 @@ alternative is to wrap the contents of `handle` inside `while True`. A blocking example using python 2.7 can be obtained from the git history: - https://github.com/bitcoin/bitcoin/blob/37a7fe9e440b83e2364d5498931253937abe9294/contrib/zmq/zmq_sub.py + https://github.com/merit/merit/blob/37a7fe9e440b83e2364d5498931253937abe9294/contrib/zmq/zmq_sub.py """ import binascii diff --git a/contrib/zmq/zmq_sub3.4.py b/contrib/zmq/zmq_sub3.4.py index bfb7ea9ea..4576df4ec 100755 --- a/contrib/zmq/zmq_sub3.4.py +++ b/contrib/zmq/zmq_sub3.4.py @@ -6,8 +6,8 @@ """ ZMQ example using python3's asyncio - Bitcoin should be started with the command line arguments: - bitcoind -testnet -daemon \ + Merit should be started with the command line arguments: + meritd -testnet -daemon \ -zmqpubhashblock=tcp://127.0.0.1:28332 \ -zmqpubrawtx=tcp://127.0.0.1:28332 \ -zmqpubhashtx=tcp://127.0.0.1:28332 \ @@ -23,7 +23,7 @@ and `await` keywords respectively. A blocking example using python 2.7 can be obtained from the git history: - https://github.com/bitcoin/bitcoin/blob/37a7fe9e440b83e2364d5498931253937abe9294/contrib/zmq/zmq_sub.py + https://github.com/merit/merit/blob/37a7fe9e440b83e2364d5498931253937abe9294/contrib/zmq/zmq_sub.py """ import binascii diff --git a/depends/README.md b/depends/README.md index 6053c531b..33d622b78 100644 --- a/depends/README.md +++ b/depends/README.md @@ -12,9 +12,9 @@ For example: make HOST=x86_64-w64-mingw32 -j4 -A prefix will be generated that's suitable for plugging into Bitcoin's +A prefix will be generated that's suitable for plugging into Merit's configure. In the above example, a dir named x86_64-w64-mingw32 will be -created. To use it for Bitcoin: +created. To use it for Merit: ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32 @@ -43,7 +43,7 @@ The following can be set when running make: make FOO=bar BUILD_ID_SALT: Optional salt to use when generating build package ids If some packages are not built, for example `make NO_WALLET=1`, the appropriate -options will be passed to bitcoin's configure. In this case, `--disable-wallet`. +options will be passed to merit's configure. In this case, `--disable-wallet`. Additional targets: diff --git a/depends/description.md b/depends/description.md index 74f9ef3f2..88697ba74 100644 --- a/depends/description.md +++ b/depends/description.md @@ -1,4 +1,4 @@ -This is a system of building and caching dependencies necessary for building Bitcoin. +This is a system of building and caching dependencies necessary for building Merit. There are several features that make it different from most similar systems: ### It is designed to be builder and host agnostic diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 58c65fb7e..7a420c9e1 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "Bitcoin Core" +PROJECT_NAME = "Merit Core" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -51,7 +51,7 @@ PROJECT_BRIEF = "P2P Digital Currency" # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = doc/bitcoin_logo_doxygen.png +PROJECT_LOGO = doc/merit_logo_doxygen.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is @@ -1265,7 +1265,7 @@ DOCSET_FEEDNAME = "Doxygen generated docs" # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_DOCSET is set to YES. -DOCSET_BUNDLE_ID = org.bitcoin.Bitcoin-Core +DOCSET_BUNDLE_ID = org.merit.Merit-Core # The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify # the documentation publisher. This should be a reverse domain-name style @@ -1273,7 +1273,7 @@ DOCSET_BUNDLE_ID = org.bitcoin.Bitcoin-Core # The default value is: org.doxygen.Publisher. # This tag requires that the tag GENERATE_DOCSET is set to YES. -DOCSET_PUBLISHER_ID = org.bitcoin.Bitcoin-Core +DOCSET_PUBLISHER_ID = org.merit.Merit-Core # The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. # The default value is: Publisher. diff --git a/doc/README.md b/doc/README.md index 275ae67e5..579d4b38e 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,41 +1,41 @@ -Bitcoin Core +Merit Core ============= Setup --------------------- -Bitcoin Core is the original Bitcoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Bitcoin transactions (which is currently more than 100 GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. +Merit Core is the original Merit client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Merit transactions (which is currently more than 100 GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. -To download Bitcoin Core, visit [bitcoincore.org](https://bitcoincore.org/en/releases/). +To download Merit Core, visit [meritcore.org](https://meritcore.org/en/releases/). Running --------------------- -The following are some helpful notes on how to run Bitcoin on your native platform. +The following are some helpful notes on how to run Merit on your native platform. ### Unix Unpack the files into a directory and run: -- `bin/bitcoin-qt` (GUI) or -- `bin/bitcoind` (headless) +- `bin/merit-qt` (GUI) or +- `bin/meritd` (headless) ### Windows -Unpack the files into a directory, and then run bitcoin-qt.exe. +Unpack the files into a directory, and then run merit-qt.exe. ### OS X -Drag Bitcoin-Core to your applications folder, and then run Bitcoin-Core. +Drag Merit-Core to your applications folder, and then run Merit-Core. ### Need Help? -* See the documentation at the [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page) +* See the documentation at the [Merit Wiki](https://en.merit.it/wiki/Main_Page) for help and more information. -* Ask for help on [#bitcoin](http://webchat.freenode.net?channels=bitcoin) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=bitcoin). -* Ask for help on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Technical Support board](https://bitcointalk.org/index.php?board=4.0). +* Ask for help on [#merit](http://webchat.freenode.net?channels=merit) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=merit). +* Ask for help on the [MeritTalk](https://bitcointalk.org/) forums, in the [Technical Support board](https://bitcointalk.org/index.php?board=4.0). Building --------------------- -The following are developer notes on how to build Bitcoin on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. +The following are developer notes on how to build Merit on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. - [OS X Build Notes](build-osx.md) - [Unix Build Notes](build-unix.md) @@ -45,12 +45,12 @@ The following are developer notes on how to build Bitcoin on your native platfor Development --------------------- -The Bitcoin repo's [root README](/README.md) contains relevant information on the development process and automated testing. +The Merit repo's [root README](/README.md) contains relevant information on the development process and automated testing. - [Developer Notes](developer-notes.md) - [Release Notes](release-notes.md) - [Release Process](release-process.md) -- [Source Code Documentation (External Link)](https://dev.visucore.com/bitcoin/doxygen/) +- [Source Code Documentation (External Link)](https://dev.visucore.com/merit/doxygen/) - [Translation Process](translation_process.md) - [Translation Strings Policy](translation_strings_policy.md) - [Travis CI](travis-ci.md) @@ -61,9 +61,9 @@ The Bitcoin repo's [root README](/README.md) contains relevant information on th - [Benchmarking](benchmarking.md) ### Resources -* Discuss on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0). -* Discuss project-specific development on #bitcoin-core-dev on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=bitcoin-core-dev). -* Discuss general Bitcoin development on #bitcoin-dev on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=bitcoin-dev). +* Discuss on the [MeritTalk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0). +* Discuss project-specific development on #merit-core-dev on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=merit-core-dev). +* Discuss general Merit development on #merit-dev on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=merit-dev). ### Miscellaneous - [Assets Attribution](assets-attribution.md) diff --git a/doc/README_osx.md b/doc/README_osx.md index 2a4460478..b475b76e8 100644 --- a/doc/README_osx.md +++ b/doc/README_osx.md @@ -92,6 +92,6 @@ build process to remain somewhat deterministic. Here's how it works: that have been previously (deterministically) built in order to create a final dmg. - The Apple keyholder uses this unsigned app to create a detached signature, - using the script that is also included there. Detached signatures are available from this [repository](https://github.com/bitcoin-core/bitcoin-detached-sigs). + using the script that is also included there. Detached signatures are available from this [repository](https://github.com/bitcoin-core/merit-detached-sigs). - Builders feed the unsigned app + detached signature back into Gitian. It uses the pre-built tools to recombine the pieces into a deterministic dmg. diff --git a/doc/README_windows.txt b/doc/README_windows.txt index 07d61b3bd..1642e2d12 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,9 +1,9 @@ -Bitcoin Core +Merit Core ============= Intro ----- -Bitcoin is a free open source peer-to-peer electronic cash system that is +Merit is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. @@ -11,13 +11,13 @@ with each other, with the help of a P2P network to check for double-spending. Setup ----- -Unpack the files into a directory and run bitcoin-qt.exe. +Unpack the files into a directory and run merit-qt.exe. -Bitcoin Core is the original Bitcoin client and it builds the backbone of the network. -However, it downloads and stores the entire history of Bitcoin transactions; +Merit Core is the original Merit client and it builds the backbone of the network. +However, it downloads and stores the entire history of Merit transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. -See the bitcoin wiki at: - https://en.bitcoin.it/wiki/Main_Page +See the merit wiki at: + https://en.merit.it/wiki/Main_Page for more help and information. diff --git a/doc/REST-interface.md b/doc/REST-interface.md index f3dc124ec..f9306b1fb 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -91,7 +91,7 @@ Only supports JSON as output format. * bytes : (numeric) size of the TX mempool in bytes * usage : (numeric) total TX mempool memory usage * maxmempool : (numeric) maximum memory usage for the mempool in bytes -* mempoolminfee : (numeric) minimum feerate (BTC per KB) for tx to be accepted +* mempoolminfee : (numeric) minimum feerate (MRT per KB) for tx to be accepted `GET /rest/mempool/contents.json` @@ -100,4 +100,4 @@ Only supports JSON as output format. Risks ------------- -Running a web browser on the same node with a REST enabled bitcoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `