Permalink
Browse files

rebrand

  • Loading branch information...
afghany committed Oct 5, 2018
1 parent 0a93b0d commit 59f1cc268c40118afbf7ab0b3aacee879f750593
Showing 473 changed files with 7,905 additions and 6,743 deletions.
@@ -6,7 +6,7 @@
# You'll also have to manually change the executable in the configuration to the correct path of the already built executable

cmake_minimum_required(VERSION 3.7)
project(dash)
project(neon)

set(CMAKE_CXX_STANDARD 11)

@@ -62,4 +62,4 @@ file(GLOB SOURCE_FILES
src/rpc/*.h
)

add_executable(dash ${SOURCE_FILES})
add_executable(neon ${SOURCE_FILES})
@@ -1,7 +1,7 @@
Contributing to Dash Core
Contributing to Nucleon Core
============================

The Dash Core project operates an open contributor model where anyone is
The Nucleon 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 Nucleon Core project (and related
projects such as libsecp256k1), and is not to be confused with overall Nucleon
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 Nucleon 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 Nucleon 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,7 +220,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 Dash consensus, it must have been
Where a patch set proposes to change the Nucleon 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.
@@ -229,7 +229,7 @@ a worthwhile change based on the judgement of the maintainers.
Release Policy
--------------

The project leader is the release manager for each Dash Core release.
The project leader is the release manager for each Nucleon Core release.

Copyright
---------
@@ -1,7 +1,7 @@
The MIT License (MIT)

Copyright (c) 2009-2017 The Bitcoin Core developers
Copyright (c) 2014-2017 The Dash Core developers
Copyright (c) 2014-2018 The Dash Core developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
1 Castle
Submodule Castle added at 43c3d4
@@ -0,0 +1,11 @@
9980 --> 16680
9981 --> 16681
9982 --> 16682

find . -type f -print0 | xargs -0 sed -i 's/9980/16680/' {} ";"

TODO
modules/gateway.go


doc/api/HostDB.md
@@ -1,5 +1,5 @@
Building Dash
Building Nucleon
=============

See doc/build-*.md for instructions on building the various
elements of the Dash Core reference implementation of Dash.
elements of the Nucleon Core reference implementation of Nucleon.
@@ -15,7 +15,7 @@ export PYTHONPATH

if BUILD_BITCOIN_LIBS
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libdashconsensus.pc
pkgconfig_DATA = libneonconsensus.pc
endif

BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
@@ -26,7 +26,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
empty :=
space := $(empty) $(empty)

OSX_APP=Dash-Qt.app
OSX_APP=Nucleon-Qt.app
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
OSX_DMG = $(OSX_VOLNAME).dmg
OSX_BACKGROUND_SVG=background.svg
@@ -40,9 +40,9 @@ 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/neon-cli.bash-completion \
$(top_srcdir)/contrib/neon-tx.bash-completion \
$(top_srcdir)/contrib/neond.bash-completion \
$(top_srcdir)/contrib/init

BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
@@ -60,9 +60,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
leveldb_baseline.info test_dash_filtered.info total_coverage.info \
leveldb_baseline.info test_neon_filtered.info total_coverage.info \
baseline_filtered.info rpc_test.info rpc_test_filtered.info \
leveldb_baseline_filtered.info test_dash_coverage.info test_dash.info
leveldb_baseline_filtered.info test_neon_coverage.info test_neon.info

dist-hook:
-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
@@ -92,7 +92,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/Dash-Qt: $(BITCOIN_QT_BIN)
$(OSX_APP)/Contents/MacOS/Nucleon-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

@@ -102,7 +102,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:

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/Dash-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
$(OSX_APP)/Contents/MacOS/Nucleon-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/Dash-Qt
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Nucleon-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/Dash-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Nucleon-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)
@@ -182,16 +182,16 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@

test_dash.info: baseline_filtered_combined.info
test_neon.info: baseline_filtered_combined.info
$(MAKE) -C src/ check
$(LCOV) -c -d $(abs_builddir)/src -t test_dash -o $@
$(LCOV) -c -d $(abs_builddir)/src -t test_neon -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb

test_dash_filtered.info: test_dash.info
test_neon_filtered.info: test_neon.info
$(LCOV) -r $< "/usr/include/*" -o $@

rpc_test.info: test_dash_filtered.info
rpc_test.info: test_neon_filtered.info
-@TIMEOUT=15 python qa/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS)
$(LCOV) -c -d $(abs_builddir)/src --t rpc-tests -o $@
$(LCOV) -z -d $(abs_builddir)/src
@@ -200,21 +200,21 @@ rpc_test.info: test_dash_filtered.info
rpc_test_filtered.info: rpc_test.info
$(LCOV) -r $< "/usr/include/*" -o $@

test_dash_coverage.info: baseline_filtered_combined.info test_dash_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -o $@
test_neon_coverage.info: baseline_filtered_combined.info test_neon_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_neon_filtered.info -o $@

total_coverage.info: baseline_filtered_combined.info test_dash_filtered.info rpc_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
total_coverage.info: baseline_filtered_combined.info test_neon_filtered.info rpc_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_neon_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt

test_dash.coverage/.dirstamp: test_dash_coverage.info
test_neon.coverage/.dirstamp: test_neon_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

total.coverage/.dirstamp: total_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

cov: test_dash.coverage/.dirstamp total.coverage/.dirstamp
cov: test_neon.coverage/.dirstamp total.coverage/.dirstamp

endif

@@ -232,5 +232,5 @@ DISTCLEANFILES = qa/pull-tester/tests_config.pyc
DISTCHECK_CONFIGURE_FLAGS = --enable-man

clean-local:
rm -rf coverage_percent.txt test_dash.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
rm -rf coverage_percent.txt test_neon.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
rm -rf qa/pull-tester/__pycache__
@@ -1,36 +1,36 @@
Dash Core staging tree 0.12.3
Nucleon Core staging tree 0.12.3
===============================

`master:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=master)](https://travis-ci.org/dashpay/dash) `develop:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=develop)](https://travis-ci.org/dashpay/dash/branches)
`master:` [![Build Status](https://travis-ci.org/MealwormsBiz/neon.svg?branch=master)](https://travis-ci.org/MealwormsBiz/neon) `develop:` [![Build Status](https://travis-ci.org/MealwormsBiz/neon.svg?branch=develop)](https://travis-ci.org/MealwormsBiz/neon/branches)

https://www.dash.org
https://www.neon.org


What is Dash?
What is Nucleon?
----------------

Dash is an experimental digital currency that enables anonymous, instant
payments to anyone, anywhere in the world. Dash uses peer-to-peer technology
Nucleon is an experimental digital currency that enables anonymous, instant
payments to anyone, anywhere in the world. Nucleon uses peer-to-peer technology
to operate with no central authority: managing transactions and issuing money
are carried out collectively by the network. Dash Core is the name of the open
are carried out collectively by the network. Nucleon Core is the name of the open
source software which enables the use of this currency.

For more information, as well as an immediately useable, binary version of
the Dash Core software, see https://www.dash.org/get-dash/.
the Nucleon Core software, see https://www.neon.org/get-neon/.


License
-------

Dash Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
Nucleon Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see https://opensource.org/licenses/MIT.

Development Process
-------------------

The `master` branch is meant to be stable. Development is normally done in separate branches.
[Tags](https://github.com/dashpay/dash/tags) are created to indicate new official,
stable release versions of Dash Core.
[Tags](https://github.com/MealwormsBiz/neon/tags) are created to indicate new official,
stable release versions of Nucleon Core.

The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).

@@ -66,12 +66,12 @@ Translations
------------

Changes to translations as well as new translations can be submitted to
[Dash Core's Transifex page](https://www.transifex.com/projects/p/dash/).
[Nucleon Core's Transifex page](https://www.transifex.com/projects/p/neon/).

Translations are periodically pulled from Transifex and merged into the git repository. See the
[translation process](doc/translation_process.md) for details on how this works.

**Important**: We do not accept translation changes as GitHub pull requests because the next
pull from Transifex would automatically overwrite them again.

Translators should also follow the [forum](https://www.dash.org/forum/topic/dash-worldwide-collaboration.88/).
Translators should also follow the [forum](https://www.neon.org/forum/topic/neon-worldwide-collaboration.88/).
@@ -7,7 +7,7 @@ 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; dash-qt frontend will not be built])
AC_MSG_WARN([$1; neon-qt frontend will not be built])
fi
bitcoin_enable_qt=no
bitcoin_enable_qt_test=no
@@ -54,7 +54,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[
dnl enable qt support
AC_ARG_WITH([gui],
[AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
[build dash-qt GUI (default=auto, qt5 tried first)])],
[build neon-qt GUI (default=auto, qt5 tried first)])],
[
bitcoin_qt_want_version=$withval
if test x$bitcoin_qt_want_version = xyes; then
Oops, something went wrong.

0 comments on commit 59f1cc2

Please sign in to comment.