diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eb738380a..a7edf7c35 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ -Contributing to Dash Core -============================ +Contributing to Neobytes Core +============================= -The Dash Core project operates an open contributor model where anyone is +The Neobytes 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. @@ -157,11 +157,11 @@ where possible keep them short, uncomplex and easy to verify. "Decision Making" Process ------------------------- -The following applies to code changes to the Dash Core project (and related -projects such as libsecp256k1), and is not to be confused with overall Dash +The following applies to code changes to the Neobytes Core project (and related +projects such as libsecp256k1), and is not to be confused with overall Neobytes Network Protocol consensus changes. -Whether a pull request is merged into Dash Core rests with the project merge +Whether a pull request is merged into Neobytes 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 @@ -179,7 +179,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 Dash consensus rules are considerably more involved than +Patches that change Neobytes 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 @@ -220,14 +220,14 @@ 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 Dash consensus, it must have been +Where a patch set proposes to change the Neobytes 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. ### Finding Reviewers -The review process is normally fairly responsive on the Dash Core repository, however +The review process is normally fairly responsive on the Neobytes Core repository, however this might not always be the case. If you find that you've been waiting for a pull request to be given attention for several months, there may be a number of reasons for this, some of which you can do something about: @@ -259,7 +259,7 @@ of reasons for this, some of which you can do something about: Release Policy -------------- -The project leader is the release manager for each Dash Core release. +The project leader is the release manager for each Neobytes Core release. Copyright --------- diff --git a/Makefile.am b/Makefile.am index 813a65a70..50af452db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ # Copyright (c) 2013-2016 The Bitcoin Core developers # Copyright (c) 2014-2018 The Dash Core developers +# Copyright (c) 2021-2024 The Neobytes Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -26,7 +27,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX empty := space := $(empty) $(empty) -OSX_APP=Dash-Qt.app +OSX_APP=Neobytes-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG=background.svg @@ -35,14 +36,14 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72 OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist -OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns +OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/neobytes.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/dash-cli.bash-completion \ - $(top_srcdir)/contrib/dash-tx.bash-completion \ - $(top_srcdir)/contrib/dashd.bash-completion \ +DIST_CONTRIB = $(top_srcdir)/contrib/neobytes-cli.bash-completion \ + $(top_srcdir)/contrib/neobytes-tx.bash-completion \ + $(top_srcdir)/contrib/neobytesd.bash-completion \ $(top_srcdir)/contrib/init DIST_SHARE = \ $(top_srcdir)/share/genbuild.sh \ @@ -51,7 +52,7 @@ DIST_SHARE = \ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \ $(top_srcdir)/contrib/devtools/security-check.py -WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \ +WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/neobytes.ico \ $(top_srcdir)/share/pixmaps/nsis-header.bmp \ $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \ $(top_srcdir)/doc/README_windows.txt @@ -63,9 +64,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \ $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh COVERAGE_INFO = baseline.info \ - test_dash_filtered.info total_coverage.info \ + test_neobytes_filtered.info total_coverage.info \ baseline_filtered.info functional_test.info functional_test_filtered.info \ - test_dash_coverage.info test_dash.info + test_neobytes_coverage.info test_neobytes.info dist-hook: -$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf - @@ -178,16 +179,16 @@ baseline_filtered.info: baseline.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -test_dash.info: baseline_filtered.info +test_neobytes.info: baseline_filtered.info $(MAKE) -C src/ check - $(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_dash -o $@ + $(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_neobytes -o $@ $(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src -test_dash_filtered.info: test_dash.info +test_neobytes_filtered.info: test_neobytes.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -functional_test.info: test_dash_filtered.info +functional_test.info: test_neobytes_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 @@ -196,13 +197,13 @@ functional_test_filtered.info: functional_test.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -test_dash_coverage.info: baseline_filtered.info test_dash_filtered.info - $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_dash_filtered.info -o $@ +test_neobytes_coverage.info: baseline_filtered.info test_neobytes_filtered.info + $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_neobytes_filtered.info -o $@ -total_coverage.info: test_dash_filtered.info functional_test_filtered.info - $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_dash_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt +total_coverage.info: test_neobytes_filtered.info functional_test_filtered.info + $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_neobytes_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt -test_dash.coverage/.dirstamp: test_dash_coverage.info +test_neobytes.coverage/.dirstamp: test_neobytes_coverage.info $(GENHTML) -s $(LCOV_OPTS) $< -o $(@D) @touch $@ @@ -210,7 +211,7 @@ total.coverage/.dirstamp: total_coverage.info $(GENHTML) -s $(LCOV_OPTS) $< -o $(@D) @touch $@ -cov: test_dash.coverage/.dirstamp total.coverage/.dirstamp +cov: test_neobytes.coverage/.dirstamp total.coverage/.dirstamp endif @@ -265,5 +266,5 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) DISTCHECK_CONFIGURE_FLAGS = --enable-man clean-local: - rm -rf coverage_percent.txt test_dash.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) + rm -rf coverage_percent.txt test_neobytes.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) rm -rf test/functional/__pycache__ diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico deleted file mode 100644 index 5a62230fb..000000000 Binary files a/share/pixmaps/bitcoin.ico and /dev/null differ diff --git a/share/pixmaps/neobytes.ico b/share/pixmaps/neobytes.ico new file mode 100644 index 000000000..fcef4c995 Binary files /dev/null and b/share/pixmaps/neobytes.ico differ diff --git a/src/qt/res/icons/bitcoin.icns b/src/qt/res/icons/bitcoin.icns deleted file mode 100644 index 0408f496d..000000000 Binary files a/src/qt/res/icons/bitcoin.icns and /dev/null differ diff --git a/src/qt/res/icons/neobytes.icns b/src/qt/res/icons/neobytes.icns new file mode 100644 index 000000000..e64b0453a Binary files /dev/null and b/src/qt/res/icons/neobytes.icns differ