diff --git a/.gitignore b/.gitignore index 3f5db0655..51abc50a6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,13 +6,13 @@ reset-files.bash *.tar.gz *.exe -src/dash -src/dashd -src/dash-cli -src/dash-tx -src/test/test_dash -src/qt/test/test_dash-qt -src/bench/bench_dash +src/neobytes +src/neobytesd +src/neobytes-cli +src/neobytes-tx +src/test/test_neobytes +src/qt/test/test_neobytes-qt +src/bench/bench_neobytes # autoreconf Makefile.in @@ -35,8 +35,8 @@ config.log config.status configure libtool -src/config/dash-config.h -src/config/dash-config.h.in +src/config/neobytes-config.h +src/config/neobytes-config.h.in src/config/stamp-h1 share/setup.nsi share/qt/Info.plist @@ -62,7 +62,7 @@ libconftest.dylib* *.o *.o-* *.patch -.dash +.neobytes *.a *.pb.cc *.pb.h @@ -81,12 +81,12 @@ libconftest.dylib* # Compilation and Qt preprocessor part *.qm Makefile -dash-qt -Dash-Qt.app +neobytes-qt +NeoBytes-Qt.app # Unit-tests Makefile.test -dash-qt_test +neobytes-qt_test src/test/buildenv.py # Resources cpp @@ -100,7 +100,7 @@ build *.gcno *.gcda /*.info -test_dash.coverage/ +test_neobytes.coverage/ total.coverage/ coverage_percent.txt @@ -124,11 +124,11 @@ share/BitcoindComparisonTool.jar /doc/doxygen/ libbitcoinconsensus.pc -src/qt/dash-qt.bash +src/qt/neobytes-qt.bash qa/pull-tester/tests-config.sh #development symlinks -dash-cli -dashd -dash-qt +neobytes-cli +neobytesd +neobytes-qt make diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7442d57d8..af11d698b 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 welcome to contribute towards development in the form of peer review, testing and patches. This document explains the practical process and guidelines for contributing. +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. Firstly in terms of structure, there is no particular concept of “Core developers” in the sense of privileged people. Open source often naturally revolves around meritocracy where longer term contributors gain more trust from the developer community. However, some hierarchy is necessary for practical purposes. As such there are repository “maintainers” who are responsible for merging pull requests as well as a “lead maintainer” who is responsible for the release cycle, overall merging, moderation and appointment of maintainers. @@ -67,9 +67,9 @@ Project maintainers aim for a quick turnaround on refactoring pull requests, so "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 Network Protocol consensus changes. +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 maintainers and ultimately the project lead. +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 principles of the project; meets the minimum standards for inclusion; and will judge the general consensus of contributors. @@ -82,7 +82,7 @@ In general, all pull requests must: - not break the existing test suite; - 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 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 other kinds of patches because of increased peer review and consensus building requirements. +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 other kinds of patches because of increased peer review and consensus building requirements. ###Peer Review @@ -101,10 +101,10 @@ Project maintainers reserve the right to weigh the opinions of peer reviewers us Where a patch set affects consensus critical code, the bar will be set much 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 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. +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. 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. diff --git a/COPYING b/COPYING index f9561cadf..969a7a931 100644 --- a/COPYING +++ b/COPYING @@ -2,6 +2,7 @@ The MIT License (MIT) Copyright (c) 2009-2016 The Bitcoin Core developers Copyright (c) 2014-2017 The Dash Core developers +Copyright (c) 2021-2024 The NeoBytes 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 diff --git a/INSTALL b/INSTALL index 2e1926d1a..69d0766f8 100644 --- a/INSTALL +++ b/INSTALL @@ -1,16 +1,5 @@ -Building Dash Core +Building NeoBytes +============= -Use the autogen script to prepare the build environment. - - ./autogen.sh - ./configure - make - -Precompiled binaries are available at github, see -https://github.com/dashpay/dash-binaries - -Always verify the signatures and checksums. - -See doc/build-*.md for instructions on building dashd, -the intended-for-services, no-graphical-interface, reference -implementation of Dash. +See doc/build-*.md for instructions on building the various +elements of the NeoBytes Core reference implementation of NeoBytes. diff --git a/Makefile.am b/Makefile.am index 816bd7f80..a68b328bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,13 +9,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libbitcoinconsensus.pc endif -BITCOIND_BIN=$(top_builddir)/src/dashd$(EXEEXT) -BITCOIN_QT_BIN=$(top_builddir)/src/qt/dash-qt$(EXEEXT) -BITCOIN_CLI_BIN=$(top_builddir)/src/dash-cli$(EXEEXT) +BITCOIND_BIN=$(top_builddir)/src/neobytesd$(EXEEXT) +BITCOIN_QT_BIN=$(top_builddir)/src/qt/neobytes-qt$(EXEEXT) +BITCOIN_CLI_BIN=$(top_builddir)/src/neobytes-cli$(EXEEXT) BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) -OSX_APP=Dash-Qt.app -OSX_DMG=Dash-Core.dmg +OSX_APP=NeoBytes-Qt.app +OSX_DMG=NeoBytes-Core.dmg OSX_BACKGROUND_IMAGE=background.tiff OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist @@ -41,9 +41,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 block_test.info \ - leveldb_baseline.info test_dash_filtered.info total_coverage.info \ + leveldb_baseline.info test_neobytes_filtered.info total_coverage.info \ baseline_filtered.info block_test_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_neobytes_coverage.info test_neobytes.info dist-hook: -$(MAKE) -C $(top_distdir)/src/leveldb clean @@ -86,7 +86,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/NeoBytes-Qt: $(BITCOIN_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ @@ -96,7 +96,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR 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/NeoBytes-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings if BUILD_DARWIN $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) @@ -111,10 +111,10 @@ $(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/NeoBytes-Qt $(OSX_DMG): $(APP_DIST_EXTRAS) - $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Dash-Core" -no-pad -r -dir-mode 0755 -apple -o $@ dist + $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "NeoBytes-Core" -no-pad -r -dir-mode 0755 -apple -o $@ dist $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) $(MKDIR_P) $(@D) @@ -122,7 +122,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BAC $(APP_DIST_DIR)/.DS_Store: contrib/macdeploy/DS_Store $(INSTALL) $< $@ -$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/NeoBytes-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 deploydir: $(APP_DIST_EXTRAS) @@ -162,16 +162,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_neobytes.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_neobytes -o $@ $(LCOV) -z -d $(abs_builddir)/src $(LCOV) -z -d $(abs_builddir)/src/leveldb -test_dash_filtered.info: test_dash.info +test_neobytes_filtered.info: test_neobytes.info $(LCOV) -r $< "/usr/include/*" -o $@ -block_test.info: test_dash_filtered.info +block_test.info: test_neobytes_filtered.info $(MKDIR_P) qa/tmp -@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) $(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@ @@ -181,7 +181,7 @@ block_test.info: test_dash_filtered.info block_test_filtered.info: block_test.info $(LCOV) -r $< "/usr/include/*" -o $@ -rpc_test.info: test_dash_filtered.info +rpc_test.info: test_neobytes_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 @@ -190,13 +190,13 @@ 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_neobytes_coverage.info: baseline_filtered_combined.info test_neobytes_filtered.info + $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_neobytes_filtered.info -o $@ -total_coverage.info: baseline_filtered_combined.info test_dash_filtered.info block_test_filtered.info rpc_test_filtered.info - $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -a block_test_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_neobytes_filtered.info block_test_filtered.info rpc_test_filtered.info + $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_neobytes_filtered.info -a block_test_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_neobytes.coverage/.dirstamp: test_neobytes_coverage.info $(GENHTML) -s $< -o $(@D) @touch $@ @@ -204,11 +204,11 @@ total.coverage/.dirstamp: total_coverage.info $(GENHTML) -s $< -o $(@D) @touch $@ -cov: test_dash.coverage/.dirstamp total.coverage/.dirstamp +cov: test_neobytes.coverage/.dirstamp total.coverage/.dirstamp endif -# Dash: disable the test until upstream switches from convoluted comparison tool +# NeoBytes: disable the test until upstream switches from convoluted comparison tool # Ref https://github.com/bitcoin/bitcoin/issues/4545 if USE_COMPARISON_TOOL check-local: @@ -225,4 +225,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) .INTERMEDIATE: $(COVERAGE_INFO) clean-local: - rm -rf coverage_percent.txt test_dash.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP) + rm -rf coverage_percent.txt test_neobytes.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP) diff --git a/README.md b/README.md index b655e50b7..66131d67a 100644 --- a/README.md +++ b/README.md @@ -1,77 +1,44 @@ -Dash Core staging tree 0.12.1 -=============================== +## What is NeoBytes? -`master:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=master)](https://travis-ci.org/dashpay/dash) `v0.12.0.x:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=v0.12.0.x)](https://travis-ci.org/dashpay/dash/branches) `v0.12.1.x:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=v0.12.1.x)](https://travis-ci.org/dashpay/dash/branches) +NeoBytes is an experimental digital currency that enables instant, private payments to anyone, anywhere in the world. NeoBytes uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. NeoBytes Core is the name of the open source software which enables the use of this currency. -https://www.dash.org +NeoBytes uses a hash algorithm NeoScrypt. Based on a total Proof of Work and Masternode system, it is accesible to everyone, it ensures a fair and stable return of investment for the Graphics Processing Units (GPUs) miners and the Masternode holders. + +For more information, as well as an immediately useable, binary version of the NeoBytes Core software, see + +## NeoBytes FAQ + +**Launch Date**: June 1, 2021 + +**Blockchain Type**: Decentralized + +**Ticker Symbol**: NBY + +**Genesis Block Hash**: "NeoBytes Genesis born on June 1, 2021" + +**Mining Algorithm**: NeoScrypt -What is Dash? ----------------- +## License +NeoBytes Core is released under the terms of the MIT license. See [COPYING](COPYING) for more information or see . -Dash is an experimental new digital currency that enables anonymous, instant -payments to anyone, anywhere in the world. Dash 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 -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/. - - -License -------- - -Dash 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. +## Development Process +The `develop` branch is regularly built and tested, but is not guaranteed to be completely stable. Additionally, the develop branch represents ongoing development from which candidate releases will be cut. +The `master` branch represents the current stable version currently in production. +[Tags](https://github.com/neobytes-project/NeoBytes/tags) are created regularly to indicate new official, stable release versions of NeoBytes Core. The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md). -Testing -------- - -Testing and code review is the bottleneck for development; we get more pull -requests than we can review and test on short notice. Please be patient and help out by testing -other people's pull requests, and remember this is a security-critical project where any mistake might cost people -lots of money. +## Testing ### Automated Testing -Developers are strongly encouraged to write [unit tests](/doc/unit-tests.md) for new code, and to -submit new unit tests for old code. Unit tests can be compiled and run -(assuming they weren't disabled in configure) with: `make check` +Developers are required to write [unit tests](src/test/README.md) for new code, and to submit new unit tests for any old code that is changed. Unit tests can be compiled and run (assuming they weren't disabled in configure) with: `make check`. Further details on running and extending unit tests can be found in [/src/test/README.md](/src/test/README.md). -There are also [regression and integration tests](/qa) of the RPC interface, written -in Python, that are run automatically on the build server. -These tests can be run (if the [test dependencies](/qa) are installed) with: `qa/pull-tester/rpc-tests.py` +There are also [regression and integration tests](/test), written in Python, that are run automatically on the build server. These tests can be run (if the [test dependencies](/test) are installed) with: `test/functional/test_runner.py` -The Travis CI system makes sure that every pull request is built for Windows -and Linux, OS X, and that unit and sanity tests are automatically run. +The Travis CI system makes sure that every pull request is built for Windows, Linux, and macOS, and that unit/sanity tests are run automatically. ### Manual Quality Assurance (QA) Testing -Changes should be tested by somebody other than the developer who wrote the -code. This is especially important for large or high-risk changes. It is useful -to add a test plan to the pull request description if testing the changes is -not straightforward. - -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/). - -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/). +Changes should be tested by somebody other than the developer who wrote the code. This is especially important for large or high-risk changes. It is useful to add a test plan to the pull request description if testing the changes is not straightforward. diff --git a/configure.ac b/configure.ac index e0f34c46b..1c3208959 100644 --- a/configure.ac +++ b/configure.ac @@ -5,18 +5,18 @@ define(_CLIENT_VERSION_MINOR, 12) define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_BUILD, 3) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2017) -AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/dashpay/dash/issues],[dashcore]) +define(_COPYRIGHT_YEAR, 2021) +AC_INIT([NeoBytes Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/neobytes-project/neobytes/issues],[neobytescore]) AC_CONFIG_SRCDIR([src/main.cpp]) -AC_CONFIG_HEADERS([src/config/dash-config.h]) +AC_CONFIG_HEADERS([src/config/neobytes-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) AC_CANONICAL_HOST -AH_TOP([#ifndef DASH_CONFIG_H]) -AH_TOP([#define DASH_CONFIG_H]) -AH_BOTTOM([#endif //DASH_CONFIG_H]) +AH_TOP([#ifndef NEOBYTES_CONFIG_H]) +AH_TOP([#define NEOBYTES_CONFIG_H]) +AH_BOTTOM([#endif //NEOBYTES_CONFIG_H]) dnl faketime breaks configure and is only needed for make. Disable it here. unset FAKETIME @@ -191,7 +191,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS" AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build dash-cli dash-tx (default=yes)])], + [build neobytes-cli neobytes-tx (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -203,7 +203,7 @@ AC_ARG_WITH([libs], AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], - [build dashd daemon (default=yes)])], + [build neobytesd daemon (default=yes)])], [build_bitcoind=$withval], [build_bitcoind=yes]) @@ -392,7 +392,7 @@ AC_C_BIGENDIAN dnl Check for pthread compile/link requirements AX_PTHREAD -# The following macro will add the necessary defines to dash-config.h, but +# The following macro will add the necessary defines to neobytes-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 @@ -777,11 +777,11 @@ LIBS="$LIBS_TEMP" BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) -AC_MSG_CHECKING([whether to build dashd]) +AC_MSG_CHECKING([whether to build neobytesd]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (dash-cli dash-tx)]) +AC_MSG_CHECKING([whether to build utils (neobytes-cli neobytes-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) @@ -882,7 +882,7 @@ 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_dash-qt]) + AC_MSG_CHECKING([whether to build test_neobytes-qt]) if test x$use_gui_tests$bitcoin_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="yes" @@ -893,7 +893,7 @@ fi AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"]) -AC_MSG_CHECKING([whether to build test_dash]) +AC_MSG_CHECKING([whether to build test_neobytes]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="yes" diff --git a/contrib/README.md b/contrib/README.md index 25cea4c01..698af7dc1 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -21,7 +21,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 Dash network. This means one can have an always-on dashd instance running, and another local dashd/dash-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 NeoBytes network. This means one can have an always-on neobytesd instance running, and another local neobytesd/neobytes-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. @@ -30,8 +30,8 @@ Build Tools and Keys --------------------- ### [Debian](/contrib/debian) ### -Contains files used to package dashd/dash-qt -for Debian-based Linux systems. If you compile dashd/dash-qt yourself, there are some useful files here. +Contains files used to package neobytesd/neobytes-qt +for Debian-based Linux systems. If you compile neobytesd/neobytes-qt yourself, there are some useful files here. ### [Gitian-descriptors](/contrib/gitian-descriptors) ### Gavin's notes on getting gitian builds up and running using KVM. @@ -46,7 +46,7 @@ Test and Verify Tools --------------------- ### [TestGen](/contrib/testgen) ### -Utilities to generate test vectors for the data-driven Dash tests. +Utilities to generate test vectors for the data-driven NeoBytes tests. ### [Test Patches](/contrib/test-patches) ### These patches are applied when the automated pull-tester diff --git a/contrib/debian/README.md b/contrib/debian/README.md index 55ff57497..66c4f88c2 100644 --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -1,21 +1,21 @@ Debian ==================== -This directory contains files used to package dashd/dash-qt -for Debian-based Linux systems. If you compile dashd/dash-qt yourself, there are some useful files here. +This directory contains files used to package neobytesd/neobytes-qt +for Debian-based Linux systems. If you compile neobytesd/neobytes-qt yourself, there are some useful files here. -## dash: URI support ## +## neobytes: URI support ## -dash-qt.desktop (Gnome / Open Desktop) +neobytes-qt.desktop (Gnome / Open Desktop) To install: - sudo desktop-file-install dash-qt.desktop + sudo desktop-file-install neobytes-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 dash-qt binary to `/usr/bin` -and the `../../share/pixmaps/dash128.png` to `/usr/share/pixmaps` +the .desktop file or copy or symlink your neobytes-qt binary to `/usr/bin` +and the `../../share/pixmaps/neobytes128.png` to `/usr/share/pixmaps` -dash-qt.protocol (KDE) +neobytes-qt.protocol (KDE) diff --git a/contrib/debian/control b/contrib/debian/control index 77454600e..840a41b04 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,8 +1,8 @@ -Source: dash +Source: neobytes Section: utils Priority: optional -Maintainer: Holger Schinzel -Uploaders: Holger Schinzel +Maintainer: NeoBytes +Uploaders: NeoBytes Build-Depends: debhelper, devscripts, automake, @@ -24,45 +24,45 @@ Build-Depends: debhelper, libprotobuf-dev, protobuf-compiler, python Standards-Version: 3.9.2 -Homepage: https://www.dash.org/ -Vcs-Git: git://github.com/dashpay/dash.git -Vcs-Browser: https://github.com/dashpay/dash +Homepage: https://www.neobytes.network/ +Vcs-Git: git://github.com/neobytes-project/neobytes.git +Vcs-Browser: https://github.com/neobytes-project/neobytes -Package: dashd +Package: neobytesd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - daemon - Dash is an experimental new digital currency that enables anonymous, instant - payments to anyone, anywhere in the world. Dash uses peer-to-peer + NeoBytes is an experimental new digital currency that enables anonymous, instant + payments to anyone, anywhere in the world. NeoBytes 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 + and issuing money are carried out collectively by the network. NeoBytes Core is the name of the open source software which enables the use of this currency. . - This package provides the daemon, dashd, and the CLI tool - dash-cli to interact with the daemon. + This package provides the daemon, neobytesd, and the CLI tool + neobytes-cli to interact with the daemon. -Package: dash-qt +Package: neobytes-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - Qt GUI - Dash is an experimental new digital currency that enables anonymous, instant - payments to anyone, anywhere in the world. Dash uses peer-to-peer + NeoBytes is an experimental new digital currency that enables anonymous, instant + payments to anyone, anywhere in the world. NeoBytes 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 + and issuing money are carried out collectively by the network. NeoBytes Core is the name of the open source software which enables the use of this currency. . - This package provides Dash-Qt, a GUI for Dash based on Qt. + This package provides NeoBytes-Qt, a GUI for NeoBytes based on Qt. -Package: dash-tx +Package: neobytes-tx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer digital currency - standalone transaction tool - Dash is an experimental new digital currency that enables anonymous, instant - payments to anyone, anywhere in the world. Dash uses peer-to-peer + NeoBytes is an experimental new digital currency that enables anonymous, instant + payments to anyone, anywhere in the world. NeoBytes 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 + and issuing money are carried out collectively by the network. NeoBytes Core is the name of the open source software which enables the use of this currency. . - This package provides dash-tx, a command-line transaction creation - tool which can be used without a dash daemon. Some means of + This package provides neobytes-tx, a command-line transaction creation + tool which can be used without a neobytes daemon. Some means of exchanging minimal transaction data with peers is still required. diff --git a/contrib/debian/dash-qt.desktop b/contrib/debian/dash-qt.desktop deleted file mode 100644 index 2a2536ad6..000000000 --- a/contrib/debian/dash-qt.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dash -Comment=Dash P2P Cryptocurrency -Comment[fr]=Dash, monnaie virtuelle cryptographique pair à pair -Comment[tr]=Dash, eşten eşe kriptografik sanal para birimi -Exec=dash-qt %u -Terminal=false -Type=Application -Icon=dash128 -MimeType=x-scheme-handler/dash; -Categories=Office;Finance; diff --git a/contrib/debian/dash-qt.install b/contrib/debian/dash-qt.install deleted file mode 100644 index c034a1366..000000000 --- a/contrib/debian/dash-qt.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/local/bin/dash-qt usr/bin -share/pixmaps/dash32.xpm usr/share/pixmaps -share/pixmaps/dash16.xpm usr/share/pixmaps -share/pixmaps/dash128.png usr/share/pixmaps -debian/dash-qt.desktop usr/share/applications -debian/dash-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/dash-tx.install b/contrib/debian/dash-tx.install deleted file mode 100644 index 51d421975..000000000 --- a/contrib/debian/dash-tx.install +++ /dev/null @@ -1 +0,0 @@ -usr/local/bin/dash-tx usr/bin diff --git a/contrib/debian/dashd.bash-completion b/contrib/debian/dashd.bash-completion deleted file mode 100644 index d92f33da7..000000000 --- a/contrib/debian/dashd.bash-completion +++ /dev/null @@ -1 +0,0 @@ -contrib/dashd.bash-completion dashd diff --git a/contrib/debian/dashd.examples b/contrib/debian/dashd.examples deleted file mode 100644 index 0b6950852..000000000 --- a/contrib/debian/dashd.examples +++ /dev/null @@ -1 +0,0 @@ -debian/examples/dash.conf diff --git a/contrib/debian/dashd.install b/contrib/debian/dashd.install deleted file mode 100644 index 65878933f..000000000 --- a/contrib/debian/dashd.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/local/bin/dashd usr/bin -usr/local/bin/dash-cli usr/bin diff --git a/contrib/debian/dashd.manpages b/contrib/debian/dashd.manpages deleted file mode 100644 index 42d160ad5..000000000 --- a/contrib/debian/dashd.manpages +++ /dev/null @@ -1,3 +0,0 @@ -debian/manpages/dashd.1 -debian/manpages/dash.conf.5 -debian/manpages/dash-cli.1 diff --git a/contrib/debian/examples/dash.conf b/contrib/debian/examples/neobytes.conf similarity index 84% rename from contrib/debian/examples/dash.conf rename to contrib/debian/examples/neobytes.conf index 12580a2ec..c84ea71e1 100644 --- a/contrib/debian/examples/dash.conf +++ b/contrib/debian/examples/neobytes.conf @@ -1,10 +1,10 @@ ## -## dash.conf configuration file. Lines beginning with # are comments. +## neobytes.conf configuration file. Lines beginning with # are comments. ## # Network-related settings: -# Run on the test network instead of the real dash network. +# Run on the test network instead of the real neobytes network. #testnet=0 # Run a regression test network @@ -44,11 +44,11 @@ # Use as many addnode= settings as you like to connect to specific peers #addnode=69.164.218.197 -#addnode=10.0.0.2:9999 +#addnode=10.0.0.2:11427 # Alternatively use as many connect= settings as you like to connect ONLY to specific peers #connect=69.164.218.197 -#connect=10.0.0.1:9999 +#connect=10.0.0.1:11427 # Listening mode, enabled by default except when 'connect' is being used #listen=1 @@ -57,10 +57,10 @@ #maxconnections= # -# JSON-RPC options (for controlling a running Dash/dashd process) +# JSON-RPC options (for controlling a running NeoBytes/neobytesd process) # -# server=1 tells Dash-Qt and dashd to accept JSON-RPC commands +# server=1 tells NeoBytes-Qt and neobytesd to accept JSON-RPC commands #server=0 # Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. @@ -71,7 +71,7 @@ #rpcuser=Ulysseys #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593 -# How many seconds Dash Core will wait for a complete RPC HTTP request. +# How many seconds NeoBytes Core will wait for a complete RPC HTTP request. # after the HTTP connection is established. #rpcclienttimeout=30 @@ -82,16 +82,16 @@ # 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 Dash-Qt to accept JSON-RPC commands. -# it is also read by dashd to determine if RPC should be enabled +# server=1 tells NeoBytes-Qt to accept JSON-RPC commands. +# it is also read by neobytesd 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 # Listen for RPC connections on this TCP port: -#rpcport=9998 +#rpcport=11426 -# You can use Dash or dashd to send commands to Dash/dashd +# You can use NeoBytes or neobytesd to send commands to NeoBytes/neobytesd # running on another host using this option: #rpcconnect=127.0.0.1 @@ -110,14 +110,14 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send dashs. Transactions with fees +# Pay an optional transaction fee every time you send neobytes. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. #paytxfee=0.00 # User interface options -# Start Dash minimized +# Start NeoBytes minimized #min=1 # Minimize to the system tray diff --git a/contrib/debian/manpages/dash-cli.1 b/contrib/debian/manpages/dash-cli.1 deleted file mode 100644 index ced0ab128..000000000 --- a/contrib/debian/manpages/dash-cli.1 +++ /dev/null @@ -1,21 +0,0 @@ -.TH DASH-CLI "1" "June 2016" "dash-cli 0.12" -.SH NAME -dash-cli \- a remote procedure call client for Dash Core. -.SH SYNOPSIS -dash-cli [options] [params] \- Send command to Dash Core. -.TP -dash-cli [options] help \- Asks Dash Core for a list of supported commands. -.SH DESCRIPTION -This manual page documents the dash-cli program. dash-cli is an RPC client used to send commands to Dash Core. - -.SH OPTIONS -.TP -\fB\-?\fR -Show possible options. - -.SH "SEE ALSO" -\fBdashd\fP, \fBdash.conf\fP -.SH AUTHOR -This manual page was written by Ciemon Dunville . Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License. - -The complete text of the MIT License can be found on the web at \fIhttp://opensource.org/licenses/MIT\fP. diff --git a/contrib/debian/manpages/dash-qt.1 b/contrib/debian/manpages/dash-qt.1 deleted file mode 100644 index 4e3d82118..000000000 --- a/contrib/debian/manpages/dash-qt.1 +++ /dev/null @@ -1,13 +0,0 @@ -.TH DASH-QT "1" "June 2016" "dash-qt 0.12" -.SH NAME -dash-qt \- peer-to-peer network based digital currency -.SH DESCRIPTION -.SS "Usage:" -.IP -dash\-qt [command\-line options] -.SH OPTIONS -.TP -\-? -List options. -.SH "SEE ALSO" -dashd(1) diff --git a/contrib/debian/manpages/dashd.1 b/contrib/debian/manpages/dashd.1 deleted file mode 100644 index c92e70769..000000000 --- a/contrib/debian/manpages/dashd.1 +++ /dev/null @@ -1,30 +0,0 @@ -.TH DASHD "1" "June 2016" "dashd 0.12" -.SH NAME -dashd \- peer-to-peer network based digital currency -.SH SYNOPSIS -dashd [options] [params] -.TP -dashd [options] help \- Get help for a command -.SH DESCRIPTION -This manual page documents the dashd program. Dash is an experimental new digital currency that enables anonymous, instant payments to anyone, anywhere in the world. Dash 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 source software which enables the use of this currency. - -.SH OPTIONS -.TP -\-? -List of possible options. -.SH COMMANDS -.TP -\fBhelp\fR -List commands. - -.TP -\fBhelp 'command'\fR -Get help for a command. - -.SH "SEE ALSO" -dash.conf(5) -.SH AUTHOR -This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. - -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. - diff --git a/contrib/debian/manpages/neobytes-cli.1 b/contrib/debian/manpages/neobytes-cli.1 new file mode 100644 index 000000000..cde40996a --- /dev/null +++ b/contrib/debian/manpages/neobytes-cli.1 @@ -0,0 +1,21 @@ +.TH NEOBYTES-CLI "1" "June 2016" "neobytes-cli 0.12" +.SH NAME +neobytes-cli \- a remote procedure call client for NeoBytes Core. +.SH SYNOPSIS +neobytes-cli [options] [params] \- Send command to NeoBytes Core. +.TP +neobytes-cli [options] help \- Asks NeoBytes Core for a list of supported commands. +.SH DESCRIPTION +This manual page documents the neobytes-cli program. neobytes-cli is an RPC client used to send commands to NeoBytes Core. + +.SH OPTIONS +.TP +\fB\-?\fR +Show possible options. + +.SH "SEE ALSO" +\fBneobytesd\fP, \fBneobytes.conf\fP +.SH AUTHOR +This manual page was written by Ciemon Dunville . Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License. + +The complete text of the MIT License can be found on the web at \fIhttp://opensource.org/licenses/MIT\fP. diff --git a/contrib/debian/manpages/neobytes-qt.1 b/contrib/debian/manpages/neobytes-qt.1 new file mode 100644 index 000000000..3795d9832 --- /dev/null +++ b/contrib/debian/manpages/neobytes-qt.1 @@ -0,0 +1,13 @@ +.TH NEOBYTES-QT "1" "June 2016" "neobytes-qt 0.12" +.SH NAME +neobytes-qt \- peer-to-peer network based digital currency +.SH DESCRIPTION +.SS "Usage:" +.IP +neobytes\-qt [command\-line options] +.SH OPTIONS +.TP +\-? +List options. +.SH "SEE ALSO" +neobytesd(1) diff --git a/contrib/debian/manpages/dash.conf.5 b/contrib/debian/manpages/neobytes.conf.5 similarity index 63% rename from contrib/debian/manpages/dash.conf.5 rename to contrib/debian/manpages/neobytes.conf.5 index 062c42ac0..590d10f8a 100644 --- a/contrib/debian/manpages/dash.conf.5 +++ b/contrib/debian/manpages/neobytes.conf.5 @@ -1,17 +1,17 @@ -.TH DASH.CONF "5" "June 2016" "dash.conf 0.12" +.TH NEOBYTES.CONF "5" "June 2016" "neobytes.conf 0.12" .SH NAME -dash.conf \- Dash Core configuration file +neobytes.conf \- NeoBytes Core configuration file .SH SYNOPSIS All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file. .TP -The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to dashd(1) for a up to date list of valid options. +The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to neobytesd(1) for a up to date list of valid options. .TP -The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, dashd(1) will look for a file named dash.conf(5) in the Dash Core data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments. +The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, neobytesd(1) will look for a file named neobytes.conf(5) in the NeoBytes Core data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments. .SH LOCATION -dash.conf should be located in $HOME/.dashcore +neobytes.conf should be located in $HOME/.neobytescore .SH "SEE ALSO" -dashd(1) +neobytesd(1) .SH AUTHOR This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. diff --git a/contrib/debian/manpages/neobytesd.1 b/contrib/debian/manpages/neobytesd.1 new file mode 100644 index 000000000..9c1e5788f --- /dev/null +++ b/contrib/debian/manpages/neobytesd.1 @@ -0,0 +1,30 @@ +.TH NEOBYTESD "1" "June 2016" "neobytesd 0.12" +.SH NAME +neobytesd \- peer-to-peer network based digital currency +.SH SYNOPSIS +neobytesd [options] [params] +.TP +neobytesd [options] help \- Get help for a command +.SH DESCRIPTION +This manual page documents the neobytesd program. NeoBytes is an experimental new digital currency that enables anonymous, instant payments to anyone, anywhere in the world. NeoBytes uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. NeoBytes Core is the name of the open source software which enables the use of this currency. + +.SH OPTIONS +.TP +\-? +List of possible options. +.SH COMMANDS +.TP +\fBhelp\fR +List commands. + +.TP +\fBhelp 'command'\fR +Get help for a command. + +.SH "SEE ALSO" +neobytes.conf(5) +.SH AUTHOR +This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. + +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. + diff --git a/contrib/debian/neobytes-qt.desktop b/contrib/debian/neobytes-qt.desktop new file mode 100644 index 000000000..eda6d025b --- /dev/null +++ b/contrib/debian/neobytes-qt.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=NeoBytes +Comment=NeoBytes P2P Cryptocurrency +Comment[fr]=NeoBytes, monnaie virtuelle cryptographique pair à pair +Comment[tr]=NeoBytes, eşten eşe kriptografik sanal para birimi +Exec=neobytes-qt %u +Terminal=false +Type=Application +Icon=neobytes128 +MimeType=x-scheme-handler/neobytes; +Categories=Office;Finance; diff --git a/contrib/debian/neobytes-qt.install b/contrib/debian/neobytes-qt.install new file mode 100644 index 000000000..127638fe7 --- /dev/null +++ b/contrib/debian/neobytes-qt.install @@ -0,0 +1,6 @@ +usr/local/bin/neobytes-qt usr/bin +share/pixmaps/neobytes32.xpm usr/share/pixmaps +share/pixmaps/neobytes16.xpm usr/share/pixmaps +share/pixmaps/neobytes128.png usr/share/pixmaps +debian/neobytes-qt.desktop usr/share/applications +debian/neobytes-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/dashd.lintian-overrides b/contrib/debian/neobytes-qt.lintian-overrides similarity index 52% rename from contrib/debian/dashd.lintian-overrides rename to contrib/debian/neobytes-qt.lintian-overrides index ef02ada1e..fc259feb0 100644 --- a/contrib/debian/dashd.lintian-overrides +++ b/contrib/debian/neobytes-qt.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -dashd: possible-gpl-code-linked-with-openssl +neobytes-qt: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/dash-qt.protocol b/contrib/debian/neobytes-qt.protocol similarity index 73% rename from contrib/debian/dash-qt.protocol rename to contrib/debian/neobytes-qt.protocol index 748709241..8e0dd5c98 100644 --- a/contrib/debian/dash-qt.protocol +++ b/contrib/debian/neobytes-qt.protocol @@ -1,6 +1,6 @@ [Protocol] -exec=dash-qt '%u' -protocol=dash +exec=neobytes-qt '%u' +protocol=neobytes input=none output=none helper=true diff --git a/contrib/debian/neobytes-tx.install b/contrib/debian/neobytes-tx.install new file mode 100644 index 000000000..04e938151 --- /dev/null +++ b/contrib/debian/neobytes-tx.install @@ -0,0 +1 @@ +usr/local/bin/neobytes-tx usr/bin diff --git a/contrib/debian/neobytesd.bash-completion b/contrib/debian/neobytesd.bash-completion new file mode 100644 index 000000000..74ed67354 --- /dev/null +++ b/contrib/debian/neobytesd.bash-completion @@ -0,0 +1 @@ +contrib/neobytesd.bash-completion neobytesd diff --git a/contrib/debian/neobytesd.examples b/contrib/debian/neobytesd.examples new file mode 100644 index 000000000..03904a062 --- /dev/null +++ b/contrib/debian/neobytesd.examples @@ -0,0 +1 @@ +debian/examples/neobytes.conf diff --git a/contrib/debian/neobytesd.install b/contrib/debian/neobytesd.install new file mode 100644 index 000000000..e561b527e --- /dev/null +++ b/contrib/debian/neobytesd.install @@ -0,0 +1,2 @@ +usr/local/bin/neobytesd usr/bin +usr/local/bin/neobytes-cli usr/bin diff --git a/contrib/debian/dash-qt.lintian-overrides b/contrib/debian/neobytesd.lintian-overrides similarity index 53% rename from contrib/debian/dash-qt.lintian-overrides rename to contrib/debian/neobytesd.lintian-overrides index bfb8d9a84..19d5aa088 100644 --- a/contrib/debian/dash-qt.lintian-overrides +++ b/contrib/debian/neobytesd.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -dash-qt: possible-gpl-code-linked-with-openssl +neobytesd: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/neobytesd.manpages b/contrib/debian/neobytesd.manpages new file mode 100644 index 000000000..fcaa6ad21 --- /dev/null +++ b/contrib/debian/neobytesd.manpages @@ -0,0 +1,3 @@ +debian/manpages/neobytesd.1 +debian/manpages/neobytes.conf.5 +debian/manpages/neobytes-cli.1 diff --git a/contrib/debian/rules b/contrib/debian/rules index df23a96d6..fa7edce20 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -1,19 +1,19 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -#DEB_MAKE_CHECK_TARGET = test_dash -#build/dashd:: -# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_dash) +#DEB_MAKE_CHECK_TARGET = test_neobytes +#build/neobytesd:: +# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_neobytes) -DEB_INSTALL_EXAMPLES_dashd += debian/examples/* -DEB_INSTALL_MANPAGES_dashd += debian/manpages/* +DEB_INSTALL_EXAMPLES_neobytesd += debian/examples/* +DEB_INSTALL_MANPAGES_neobytesd += debian/manpages/* %: 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/dash-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/neobytes-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in # Yea, autogen should be run on the source archive, but I like doing git archive override_dh_auto_configure: diff --git a/contrib/debian/watch b/contrib/debian/watch index c41312066..9df0ab3c9 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/dashpay/dash v(.*).tar.gz + http://githubredir.debian.net/github/neobytes-project/neobytes v(.*).tar.gz diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index fa1b55971..392041b80 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -98,10 +98,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_dash: symbol memcpy from unsupported version GLIBC_2.14 - .../64/test_dash: symbol __fdelt_chk from unsupported version GLIBC_2.15 - .../64/test_dash: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 - .../64/test_dash: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 + .../64/test_neobytes: symbol memcpy from unsupported version GLIBC_2.14 + .../64/test_neobytes: symbol __fdelt_chk from unsupported version GLIBC_2.15 + .../64/test_neobytes: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 + .../64/test_neobytes: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 update-translations.py ====================== diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py index 96fc41c99..5e8d3ab58 100755 --- a/contrib/devtools/update-translations.py +++ b/contrib/devtools/update-translations.py @@ -26,7 +26,7 @@ import xml.etree.ElementTree as ET # Name of transifex tool TX = 'tx' # Name of source language file -SOURCE_LANG = 'dash_en.ts' +SOURCE_LANG = 'neobytes_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/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 1660cd3db..3bdd52972 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/dashpay/dash.git + git clone git://github.com/neobytes-project/neobytes.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/dashpay/dash.git + git clone git://github.com/neobytes-project/neobytes.git ... etc diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 7f84518a7..dd1db585b 100755 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "dash-linux-0.12" +name: "neobytes-linux-0.12" enable_cache: true suites: - "trusty" @@ -20,8 +20,8 @@ packages: - "python" reference_datetime: "2017-01-01 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash.git" - "dir": "dash" +- "url": "https://github.com/neobytes-project/neobytes.git" + "dir": "neobytes" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -68,7 +68,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd dash + cd neobytes BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -79,13 +79,13 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo dashcore-*.tar.gz` + SOURCEDIST=`echo neobytescore-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find dashcore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find neobytescore-* | 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-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index a68d31f10..c2c6a56b8 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -1,5 +1,5 @@ --- -name: "dash-dmg-signer" +name: "neobytes-dmg-signer" suites: - "trusty" architectures: @@ -8,10 +8,10 @@ packages: - "faketime" reference_datetime: "2017-01-01 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash-detached-sigs.git" +- "url": "https://github.com/neobytes-project/neobytes-detached-sigs.git" "dir": "signature" files: -- "dash-osx-unsigned.tar.gz" +- "neobytes-osx-unsigned.tar.gz" script: | WRAP_DIR=$HOME/wrapped mkdir -p ${WRAP_DIR} @@ -28,10 +28,10 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=dash-osx-unsigned.tar.gz - SIGNED=dash-osx-signed.dmg + UNSIGNED=neobytes-osx-unsigned.tar.gz + SIGNED=neobytes-osx-signed.dmg tar -xf ${UNSIGNED} ./detached-sig-apply.sh ${UNSIGNED} signature/osx - ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Dash-Core" -no-pad -r -dir-mode 0755 -apple -o uncompressed.dmg signed-app + ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "NeoBytes-Core" -no-pad -r -dir-mode 0755 -apple -o uncompressed.dmg signed-app ${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED} diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 98fd814c3..21ca179c9 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "dash-osx-0.12" +name: "neobytes-osx-0.12" enable_cache: true suites: - "trusty" @@ -23,8 +23,8 @@ packages: - "python" reference_datetime: "2017-01-01 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash.git" - "dir": "dash" +- "url": "https://github.com/neobytes-project/neobytes.git" + "dir": "neobytes" files: - "MacOSX10.9.sdk.tar.gz" script: | @@ -71,7 +71,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd dash + cd neobytes BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs @@ -86,14 +86,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo dashcore-*.tar.gz` + SOURCEDIST=`echo neobytescore-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find dashcore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find neobytescore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd ORIGPATH="$PATH" @@ -123,7 +123,7 @@ script: | popd make deploy - ${WRAP_DIR}/dmg dmg Dash-Core.dmg ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg + ${WRAP_DIR}/dmg dmg NeoBytes-Core.dmg ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg cd installed find . -name "lib*.la" -delete diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml index a7119da37..a1fea04d1 100644 --- a/contrib/gitian-descriptors/gitian-rpi2.yml +++ b/contrib/gitian-descriptors/gitian-rpi2.yml @@ -1,5 +1,5 @@ --- -name: "dash-raspberry-0.12" +name: "neobytes-raspberry-0.12" enable_cache: true suites: - "precise" @@ -17,8 +17,8 @@ packages: - "binutils-gold" reference_datetime: "2017-01-01 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash.git" - "dir": "dash" +- "url": "https://github.com/neobytes-project/neobytes.git" + "dir": "neobytes" files: - "raspberrypi-tools.tar.gz" script: | @@ -67,7 +67,7 @@ script: | done export PATH=${WRAP_DIR}:${PATH} - cd dash + cd neobytes BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -78,13 +78,13 @@ script: | ./autogen.sh ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` make NO_QT=1 dist - SOURCEDIST=`echo dashcore-*.tar.gz` + SOURCEDIST=`echo neobytescore-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find dashcore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find neobytescore-* | 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-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 5eda39ff6..a487704f5 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -9,7 +9,7 @@ packages: - "autoconf" reference_datetime: "2017-01-01 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash-detached-sigs.git" +- "url": "https://github.com/neobytes-project/neobytes-detached-sigs.git" "dir": "signature" files: - "osslsigncode-1.7.1.tar.gz" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index f219f0421..1280654d2 100755 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "dash-win-0.12" +name: "neobytes-win-0.12" enable_cache: true suites: - "trusty" @@ -23,8 +23,8 @@ packages: - "python" reference_datetime: "2017-01-01 00:00:00" remotes: -- "url": "https://github.com/dashpay/dash.git" - "dir": "dash" +- "url": "https://github.com/neobytes-project/neobytes.git" + "dir": "neobytes" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -94,7 +94,7 @@ script: | export PATH=${WRAP_DIR}:${PATH} - cd dash + cd neobytes BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -105,14 +105,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo dashcore-*.tar.gz` + SOURCEDIST=`echo neobytescore-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find dashcore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find neobytescore-* | 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 @@ -132,7 +132,7 @@ script: | make ${MAKEOPTS} -C src check-security make deploy make install DESTDIR=${INSTALLPATH} - cp -f dashcore-*setup*.exe $OUTDIR/ + cp -f neobytescore-*setup*.exe $OUTDIR/ cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete diff --git a/contrib/init/README.md b/contrib/init/README.md index 8bda937e2..917e4e22c 100644 --- a/contrib/init/README.md +++ b/contrib/init/README.md @@ -1,11 +1,11 @@ Sample configuration files for: -SystemD: dashd.service -Upstart: dashd.conf -OpenRC: dashd.openrc - dashd.openrcconf -CentOS: dashd.init -OS X: org.dash.dashd.plist +SystemD: neobytesd.service +Upstart: neobytesd.conf +OpenRC: neobytesd.openrc + neobytesd.openrcconf +CentOS: neobytesd.init +OS X: org.neobytes.neobytesd.plist have been made available to assist packagers in creating node packages here. diff --git a/contrib/init/dashd.service b/contrib/init/dashd.service deleted file mode 100644 index a256c6a03..000000000 --- a/contrib/init/dashd.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Dash's distributed currency daemon -After=network.target - -[Service] -User=dashcore -Group=dashcore - -Type=forking -PIDFile=/var/lib/dashd/dashd.pid -ExecStart=/usr/bin/dashd -daemon -pid=/var/lib/dashd/dashd.pid \ --conf=/etc/dashcore/dash.conf -datadir=/var/lib/dashd -disablewallet - -Restart=always -PrivateTmp=true -TimeoutStopSec=60s -TimeoutStartSec=2s -StartLimitInterval=120s -StartLimitBurst=5 - -[Install] -WantedBy=multi-user.target diff --git a/contrib/init/dashd.conf b/contrib/init/neobytesd.conf similarity index 74% rename from contrib/init/dashd.conf rename to contrib/init/neobytesd.conf index fbcb7ebf1..88fd8dc61 100644 --- a/contrib/init/dashd.conf +++ b/contrib/init/neobytesd.conf @@ -1,16 +1,16 @@ -description "Dash Core Daemon" +description "NeoBytes Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] -env BITCOIND_BIN="/usr/bin/dashd" -env BITCOIND_USER="dashcore" -env BITCOIND_GROUP="dashcore" -env BITCOIND_PIDDIR="/var/run/dashd" +env BITCOIND_BIN="/usr/bin/neobytesd" +env BITCOIND_USER="neobytescore" +env BITCOIND_GROUP="neobytescore" +env BITCOIND_PIDDIR="/var/run/neobytesd" # upstart can't handle variables constructed with other variables -env BITCOIND_PIDFILE="/var/run/dashd/dashd.pid" -env BITCOIND_CONFIGFILE="/etc/dashcore/dash.conf" -env BITCOIND_DATADIR="/var/lib/dashd" +env BITCOIND_PIDFILE="/var/run/neobytesd/neobytesd.pid" +env BITCOIND_CONFIGFILE="/etc/neobytescore/neobytes.conf" +env BITCOIND_DATADIR="/var/lib/neobytesd" expect fork @@ -20,12 +20,12 @@ kill timeout 60 pre-start script # this will catch non-existent config files - # dashd will check and exit with this very warning, but it can do so + # neobytesd 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 dashd." + echo "ERROR: You must set a secure rpcpassword to run neobytesd." echo "The setting must appear in $BITCOIND_CONFIGFILE" echo echo "This password is security critical to securing wallets " @@ -38,7 +38,7 @@ pre-start script echo "It is also recommended that you also set alertnotify so you are " echo "notified of problems:" echo - echo "ie: alertnotify=echo %%s | mail -s \"Dash Core Alert\"" \ + echo "ie: alertnotify=echo %%s | mail -s \"NeoBytes Core Alert\"" \ "admin@foo.com" echo exit 1 diff --git a/contrib/init/dashd.init b/contrib/init/neobytesd.init similarity index 54% rename from contrib/init/dashd.init rename to contrib/init/neobytesd.init index 3bfc473f9..e2ec19bad 100644 --- a/contrib/init/dashd.init +++ b/contrib/init/neobytesd.init @@ -1,36 +1,36 @@ #!/bin/bash # -# dashd The Dash Core server. +# neobytesd The NeoBytes Core server. # # # chkconfig: 345 80 20 -# description: dashd -# processname: dashd +# description: neobytesd +# processname: neobytesd # # Source function library. . /etc/init.d/functions -# you can override defaults in /etc/sysconfig/dashd, see below -if [ -f /etc/sysconfig/dashd ]; then - . /etc/sysconfig/dashd +# you can override defaults in /etc/sysconfig/neobytesd, see below +if [ -f /etc/sysconfig/neobytesd ]; then + . /etc/sysconfig/neobytesd fi RETVAL=0 -prog=dashd -# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/dashd -lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/dashd} +prog=neobytesd +# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/neobytesd +lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/neobytesd} -# dashd defaults to /usr/bin/dashd, override with BITCOIND_BIN -dashd=${BITCOIND_BIN-/usr/bin/dashd} +# neobytesd defaults to /usr/bin/neobytesd, override with BITCOIND_BIN +neobytesd=${BITCOIND_BIN-/usr/bin/neobytesd} -# dashd opts default to -disablewallet, override with BITCOIND_OPTS -dashd_opts=${BITCOIND_OPTS--disablewallet} +# neobytesd opts default to -disablewallet, override with BITCOIND_OPTS +neobytesd_opts=${BITCOIND_OPTS--disablewallet} start() { echo -n $"Starting $prog: " - daemon $DAEMONOPTS $dashd $dashd_opts + daemon $DAEMONOPTS $neobytesd $neobytesd_opts RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/contrib/init/dashd.openrc b/contrib/init/neobytesd.openrc similarity index 71% rename from contrib/init/dashd.openrc rename to contrib/init/neobytesd.openrc index e8e851584..7eed2d447 100644 --- a/contrib/init/dashd.openrc +++ b/contrib/init/neobytesd.openrc @@ -2,26 +2,26 @@ # backward compatibility for existing gentoo layout # -if [ -d "/var/lib/dashcore/.dashcore" ]; then - BITCOIND_DEFAULT_DATADIR="/var/lib/dashcore/.dashcore" +if [ -d "/var/lib/neobytescore/.neobytescore" ]; then + BITCOIND_DEFAULT_DATADIR="/var/lib/neobytescore/.neobytescore" else - BITCOIND_DEFAULT_DATADIR="/var/lib/dashd" + BITCOIND_DEFAULT_DATADIR="/var/lib/neobytesd" fi -BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/dashcore/dash.conf} -BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/dashd} -BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/dashd.pid} +BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/neobytescore/neobytes.conf} +BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/neobytesd} +BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/neobytesd.pid} BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} -BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-dashcore}} -BITCOIND_GROUP=${BITCOIND_GROUP:-dashcore} -BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/dashd} +BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-neobytescore}} +BITCOIND_GROUP=${BITCOIND_GROUP:-neobytescore} +BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/neobytesd} BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" -name="Dash Core Daemon" -description="Dash cryptocurrency P2P network daemon" +name="NeoBytes Core Daemon" +description="NeoBytes cryptocurrency P2P network daemon" -command="/usr/bin/dashd" +command="/usr/bin/neobytesd" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ -conf=\"${BITCOIND_CONFIGFILE}\" \ -datadir=\"${BITCOIND_DATADIR}\" \ @@ -71,7 +71,7 @@ checkconfig() { if ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then eerror "" - eerror "ERROR: You must set a secure rpcpassword to run dashd." + eerror "ERROR: You must set a secure rpcpassword to run neobytesd." eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" eerror "" eerror "This password is security critical to securing wallets " @@ -84,7 +84,7 @@ checkconfig() eerror "It is also recommended that you also set alertnotify so you are " eerror "notified of problems:" eerror "" - eerror "ie: alertnotify=echo %%s | mail -s \"Dash Core Alert\"" \ + eerror "ie: alertnotify=echo %%s | mail -s \"NeoBytes Core Alert\"" \ "admin@foo.com" eerror "" return 1 diff --git a/contrib/init/dashd.openrcconf b/contrib/init/neobytesd.openrcconf similarity index 52% rename from contrib/init/dashd.openrcconf rename to contrib/init/neobytesd.openrcconf index a5977598a..2411b23ad 100644 --- a/contrib/init/dashd.openrcconf +++ b/contrib/init/neobytesd.openrcconf @@ -1,25 +1,25 @@ -# /etc/conf.d/dashd: config file for /etc/init.d/dashd +# /etc/conf.d/neobytesd: config file for /etc/init.d/neobytesd # Config file location -#BITCOIND_CONFIGFILE="/etc/dashcore/dash.conf" +#BITCOIND_CONFIGFILE="/etc/neobytescore/neobytes.conf" # What directory to write pidfile to? (created and owned by $BITCOIND_USER) -#BITCOIND_PIDDIR="/var/run/dashd" +#BITCOIND_PIDDIR="/var/run/neobytesd" # What filename to give the pidfile -#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/dashd.pid" +#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/neobytesd.pid" -# Where to write dashd data (be mindful that the blockchain is large) -#BITCOIND_DATADIR="/var/lib/dashd" +# Where to write neobytesd data (be mindful that the blockchain is large) +#BITCOIND_DATADIR="/var/lib/neobytesd" -# User and group to own dashd process -#BITCOIND_USER="dashcore" -#BITCOIND_GROUP="dashcore" +# User and group to own neobytesd process +#BITCOIND_USER="neobytescore" +#BITCOIND_GROUP="neobytescore" -# Path to dashd executable -#BITCOIND_BIN="/usr/bin/dashd" +# Path to neobytesd executable +#BITCOIND_BIN="/usr/bin/neobytesd" -# Nice value to run dashd under +# Nice value to run neobytesd under #BITCOIND_NICE=0 # Additional options (avoid -conf and -datadir, use flags above) diff --git a/contrib/init/neobytesd.service b/contrib/init/neobytesd.service new file mode 100644 index 000000000..18000ecde --- /dev/null +++ b/contrib/init/neobytesd.service @@ -0,0 +1,22 @@ +[Unit] +Description=NeoBytes distributed currency daemon +After=network.target + +[Service] +User=neobytescore +Group=neobytescore + +Type=forking +PIDFile=/var/lib/neobytesd/neobytesd.pid +ExecStart=/usr/bin/neobytesd -daemon -pid=/var/lib/neobytesd/neobytesd.pid \ +-conf=/etc/neobytescore/neobytes.conf -datadir=/var/lib/neobytesd -disablewallet + +Restart=always +PrivateTmp=true +TimeoutStopSec=60s +TimeoutStartSec=2s +StartLimitInterval=120s +StartLimitBurst=5 + +[Install] +WantedBy=multi-user.target diff --git a/contrib/init/org.dash.dashd.plist b/contrib/init/org.neobytes.neobytesd.plist similarity index 78% rename from contrib/init/org.dash.dashd.plist rename to contrib/init/org.neobytes.neobytesd.plist index 9873f1a3f..84bf102dd 100644 --- a/contrib/init/org.dash.dashd.plist +++ b/contrib/init/org.neobytes.neobytesd.plist @@ -3,10 +3,10 @@ Label - org.dash.dashd + org.neobytes.neobytesd ProgramArguments - /usr/local/bin/dashd + /usr/local/bin/neobytesd -daemon RunAtLoad diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index 3570f65e6..1d1577b7a 100644 --- a/contrib/linearize/README.md +++ b/contrib/linearize/README.md @@ -1,9 +1,9 @@ # Linearize Construct a linear, no-fork, best version of the blockchain. -## Step 0: Install dash_hash +## Step 0: Install neobytes_hash -https://github.com/dashpay/dash_hash +https://github.com/neobytes-project/neobytes_hash ## Step 1: Download hash list diff --git a/contrib/linearize/example-linearize-testnet.cfg b/contrib/linearize/example-linearize-testnet.cfg index 696ae228d..5ed0c2501 100644 --- a/contrib/linearize/example-linearize-testnet.cfg +++ b/contrib/linearize/example-linearize-testnet.cfg @@ -3,18 +3,18 @@ rpcuser=someuser rpcpassword=somepassword host=127.0.0.1 -port=19998 +port=12426 # bootstrap.dat hashlist settings (linearize-hashes) max_height=3130000 # bootstrap.dat input/output settings (linearize-data) -netmagic=cee2caff -input=/home/example/.dashcore/testnet3/blocks +netmagic=4c756e61 +input=/home/example/.neobytescore/testnet3/blocks output_file=/home/example/Downloads/bootstrap.dat hashlist=hashlist.txt split_year=1 -genesis=00000bafbc94add76cb75e2ec92894837288a481e5c005f6563d91623bf8bc2c +genesis=00000ad9084e88ff821acb1bd70d1a2d5d1150cc18dd8cb035bc91c67beee780 # Maxmimum size in bytes of out-of-order blocks cache in memory out_of_order_cache_sz = 10000000 diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 09a66dc74..8d63fe580 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -3,18 +3,18 @@ rpcuser=someuser rpcpassword=somepassword host=127.0.0.1 -port=9998 +port=11426 # bootstrap.dat hashlist settings (linearize-hashes) max_height=3130000 # bootstrap.dat input/output settings (linearize-data) -netmagic=bf0c6bbd -input=/home/example/.dashcore/blocks +netmagic=536e6f77 +input=/home/example/.neobytescore/blocks output_file=/home/example/Downloads/bootstrap.dat hashlist=hashlist.txt split_year=1 -genesis=00000ffd590b1485b3caadc19b22e6379c733355108f107a430458cdf3407ab6 +genesis=00000cb14ca1b70af1ad67f4e2f478da3ea4eae76f95e4b6b60895478beacb79 # Maxmimum size in bytes of out-of-order blocks cache in memory out_of_order_cache_sz = 10000000 diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py index 69eb9e1d9..0a22cbf90 100755 --- a/contrib/linearize/linearize-data.py +++ b/contrib/linearize/linearize-data.py @@ -17,7 +17,7 @@ import base64 import httplib import sys import hashlib -import dash_hash +import neobytes_hash import datetime import time from collections import namedtuple @@ -55,7 +55,7 @@ def calc_hdr_hash(blk_hdr): #hash2_o = hash2.digest() #return hash2_o - pow_hash = dash_hash.getPoWHash(blk_hdr) + pow_hash = neobytes_hash.getPoWHash(blk_hdr) return pow_hash def calc_hash_str(blk_hdr): diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index ee87ceafb..ea8d351aa 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -96,7 +96,7 @@ if __name__ == '__main__': if 'host' not in settings: settings['host'] = '127.0.0.1' if 'port' not in settings: - settings['port'] = 9998 + settings['port'] = 11426 if 'min_height' not in settings: settings['min_height'] = 0 if 'max_height' not in settings: diff --git a/contrib/macdeploy/Base.lproj/InfoPlist.strings b/contrib/macdeploy/Base.lproj/InfoPlist.strings index e14911ad1..2ef1ee029 100644 --- a/contrib/macdeploy/Base.lproj/InfoPlist.strings +++ b/contrib/macdeploy/Base.lproj/InfoPlist.strings @@ -1 +1 @@ -{ CFBundleDisplayName = "Dash Core"; CFBundleName = "Dash Core"; } +{ CFBundleDisplayName = "NeoBytes Core"; CFBundleName = "NeoBytes Core"; } diff --git a/contrib/macdeploy/DS_Store b/contrib/macdeploy/DS_Store deleted file mode 100644 index db9d16f1d..000000000 Binary files a/contrib/macdeploy/DS_Store and /dev/null differ diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index a5e743710..741440a78 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 `Dash-Core.dmg`. +When finished, it will produce `NeoBytes-Core.dmg`. diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index b3e27d91c..848521d5d 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -2,7 +2,7 @@ set -e ROOTDIR=dist -BUNDLE="${ROOTDIR}/Dash-Qt.app" +BUNDLE="${ROOTDIR}/NeoBytes-Qt.app" CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index 90071abea..d1f7ce723 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Dash-Qt.app + NeoBytes-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 1f8859c9e..a0608ad6d 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 = "Dash-Qt" + appName = "NeoBytes-Qt" self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) if not os.path.exists(self.binaryPath): raise RuntimeError("Could not find bundle binary for " + path) @@ -596,7 +596,7 @@ if os.path.exists("dist"): # ------------------------------------------------ -target = os.path.join("dist", "Dash-Qt.app") +target = os.path.join("dist", "NeoBytes-Qt.app") if verbose >= 2: print "+ Copying source bundle +" @@ -757,7 +757,7 @@ if config.dmg is not None: if fancy is None: try: - runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname="Dash-Core", ov=True) + runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname="NeoBytes-Core", ov=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) else: @@ -772,7 +772,7 @@ if config.dmg is not None: if verbose >= 3: print "Creating temp image for modification..." try: - runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname="Dash-Core", ov=True) + runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname="NeoBytes-Core", ov=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) @@ -837,7 +837,7 @@ if config.dmg is not None: items_positions.append(itemscript.substitute(params)) params = { - "disk" : "Dash-Core", + "disk" : "NeoBytes-Core", "window_bounds" : "300,300,800,620", "icon_size" : "96", "background_commands" : "", diff --git a/contrib/dash-qt.pro b/contrib/neobytes-qt.pro similarity index 96% rename from contrib/dash-qt.pro rename to contrib/neobytes-qt.pro index 9b4c4c3b9..03dfee940 100644 --- a/contrib/dash-qt.pro +++ b/contrib/neobytes-qt.pro @@ -19,4 +19,4 @@ FORMS += \ ../src/qt/forms/transactiondescdialog.ui RESOURCES += \ - ../src/qt/dash.qrc + ../src/qt/neobytes.qrc diff --git a/contrib/dashd.bash-completion b/contrib/neobytesd.bash-completion similarity index 81% rename from contrib/dashd.bash-completion rename to contrib/neobytesd.bash-completion index 18880e809..d770b05a8 100644 --- a/contrib/dashd.bash-completion +++ b/contrib/neobytesd.bash-completion @@ -1,12 +1,12 @@ -# bash programmable completion for dashd(1) and dash-cli(1) +# bash programmable completion for neobytesd(1) and neobytes-cli(1) # Copyright (c) 2012,2014 Christian von Roques # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -have dashd && { +have neobytesd && { -# call $dashd for RPC -_dash_rpc() { +# call $neobytesd for RPC +_neobytes_rpc() { # determine already specified args necessary for RPC local rpcargs=() for i in ${COMP_LINE}; do @@ -16,23 +16,23 @@ _dash_rpc() { ;; esac done - $dashd "${rpcargs[@]}" "$@" + $neobytesd "${rpcargs[@]}" "$@" } -# Add dash accounts to COMPREPLY -_dash_accounts() { +# Add neobytes accounts to COMPREPLY +_neobytes_accounts() { local accounts - accounts=$(_dash_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}') + accounts=$(_neobytes_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}') COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) ) } -_dashd() { +_neobytesd() { local cur prev words=() cword - local dashd + local neobytesd - # save and use original argument to invoke dashd - # dashd might not be in $PATH - dashd="$1" + # save and use original argument to invoke neobytesd + # neobytesd might not be in $PATH + neobytesd="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -53,7 +53,7 @@ _dashd() { if ((cword > 3)); then case ${words[cword-3]} in addmultisigaddress) - _dash_accounts + _neobytes_accounts return 0 ;; getbalance|gettxout|importaddress|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock) @@ -74,7 +74,7 @@ _dashd() { return 0 ;; move|setaccount) - _dash_accounts + _neobytes_accounts return 0 ;; esac @@ -90,7 +90,7 @@ _dashd() { return 0 ;; getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany) - _dash_accounts + _neobytes_accounts return 0 ;; esac @@ -114,12 +114,12 @@ _dashd() { # only parse --help if senseful if [[ -z "$cur" || "$cur" =~ ^- ]]; then - helpopts=$($dashd --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($neobytesd --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) fi # only parse help if senseful if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then - commands=$(_dash_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') + commands=$(_neobytes_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }') fi COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) ) @@ -133,7 +133,7 @@ _dashd() { esac } -complete -F _dashd dashd dash-cli +complete -F _neobytesd neobytesd neobytes-cli } # Local variables: diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 1fcbb1a6f..ae8c90bc3 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### Qos ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Dash network. It limits outbound TCP traffic with a source or destination port of 9999, but not if the destination IP is within a LAN (defined as 192.168.x.x). +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the NeoBytes network. It limits outbound TCP traffic with a source or destination port of 11427, but not if the destination IP is within a LAN (defined as 192.168.x.x). 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. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index 8ead5789a..8d5c65ba6 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -2,7 +2,7 @@ IF="eth0" #limit of the network interface in question LINKCEIL="1gbit" -#limit outbound Dash protocol traffic to this rate +#limit outbound NeoBytes protocol traffic to this rate LIMIT="160kbit" #defines the address space for which you wish to disable rate limiting LOCALNET="192.168.0.0/16" @@ -32,10 +32,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11 # ret=$? #done -#limit outgoing traffic to and from port 9999. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 11427. but not when dealing with a host on the local network # (defined by $LOCALNET) # --set-mark marks packages matching these criteria with the number "2" # these packages are filtered by the tc filter with "handle 2" # this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT} -iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9999 ! -d ${LOCALNET} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9999 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 11427 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 11427 ! -d ${LOCALNET} -j MARK --set-mark 0x2 diff --git a/contrib/qt_translations.py b/contrib/qt_translations.py index 515d3daab..572cb3a33 100755 --- a/contrib/qt_translations.py +++ b/contrib/qt_translations.py @@ -2,7 +2,7 @@ # Helpful little script that spits out a comma-separated list of # language codes for Qt icons that should be included -# in binary Dash Core distributions +# in binary NeoBytes Core distributions import glob import os @@ -16,7 +16,7 @@ d1 = sys.argv[1] d2 = sys.argv[2] l1 = set([ re.search(r'qt_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d1, 'qt_*.qm')) ]) -l2 = set([ re.search(r'dash_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d2, 'dash_*.qm')) ]) +l2 = set([ re.search(r'neobytes_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d2, 'neobytes_*.qm')) ]) print ",".join(sorted(l1.intersection(l2))) diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index 5df20ea13..278b3dbae 100755 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -117,21 +117,21 @@ def main(): exit(1) g = sys.stdout indir = sys.argv[1] - g.write('#ifndef DASH_CHAINPARAMSSEEDS_H\n') - g.write('#define DASH_CHAINPARAMSSEEDS_H\n') + g.write('#ifndef NEOBYTES_CHAINPARAMSSEEDS_H\n') + g.write('#define NEOBYTES_CHAINPARAMSSEEDS_H\n') g.write('/**\n') - g.write(' * List of fixed seed nodes for the dash network\n') + g.write(' * List of fixed seed nodes for the neobytes 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') g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n') g.write(' */\n') with open(os.path.join(indir,'nodes_main.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_main', 9999) + process_nodes(g, f, 'pnSeed6_main', 11427) g.write('\n') with open(os.path.join(indir,'nodes_test.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_test', 19999) - g.write('#endif // DASH_CHAINPARAMSSEEDS_H\n') + process_nodes(g, f, 'pnSeed6_test', 12427) + g.write('#endif // NEOBYTES_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': main() diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 2dfb30d9d..401c1df13 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -7,16 +7,11 @@ NSEEDS=512 MAX_SEEDS_PER_ASN=2 -MIN_BLOCKS = 400000 +MIN_BLOCKS = 46800 # These are hosts that have been observed to be behaving strangely (e.g. # aggressively connecting to every node). SUSPICIOUS_HOSTS = set([ - "130.211.129.106", "178.63.107.226", - "83.81.130.26", "88.198.17.7", "148.251.238.178", "176.9.46.6", - "54.173.72.127", "54.174.10.182", "54.183.64.54", "54.194.231.211", - "54.66.214.167", "54.66.220.137", "54.67.33.14", "54.77.251.214", - "54.94.195.96", "54.94.200.247" ]) import re diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index f1854b27f..139597f9c 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -1,937 +1,2 @@ -5.2.145.201:8333 -5.22.142.214:8333 -5.53.172.197:8333 -5.189.161.164:8333 -5.230.140.166:8333 -5.231.3.130:8333 -5.255.80.103:8333 -14.202.230.49:8333 -18.85.11.130:8333 -23.91.97.25:8333 -23.94.100.122:8333 -23.95.99.132:8333 -24.115.8.206:8333 -24.127.128.191:8333 -24.154.178.25:8333 -24.207.103.43:8333 -24.207.104.105:8333 -24.210.230.150:8333 -24.224.18.84:8333 -24.246.168.106:8333 -27.254.64.47:8333 -31.6.71.123:8333 -31.6.71.124:8333 -31.14.134.13:8333 -31.30.36.220:8333 -31.164.6.104:8333 -31.170.106.203:8333 -31.185.134.201:8333 -31.204.128.99:8333 -31.204.128.219:8333 -37.1.219.88:8333 -37.97.132.109:8333 -37.120.160.55:8333 -37.120.169.123:8333 -37.139.32.46:8333 -37.221.163.218:8333 -38.130.192.72:8333 -41.75.96.80:8333 -45.3.0.49:8333 -45.33.72.185:8333 -45.33.96.129:8333 -45.56.4.63:8333 -45.79.0.127:8333 -45.79.80.102:8333 -45.79.97.30:8333 -45.79.132.219:8333 -46.21.97.135:8333 -46.28.205.67:8333 -46.28.206.188:8333 -46.29.20.209:8333 -46.50.234.179:8333 -46.101.160.168:8333 -46.166.161.35:8333 -46.166.161.103:8333 -46.182.132.100:8333 -46.218.227.92:8333 -46.226.109.20:8333 -46.227.66.132:8333 -46.227.66.138:8333 -46.229.165.154:8333 -46.229.165.155:8333 -46.229.238.187:8333 -46.234.104.48:8333 -46.239.107.74:8333 -46.244.0.138:8333 -46.254.72.195:8333 -50.5.13.44:8333 -50.7.37.114:8333 -50.30.37.103:8333 -50.39.105.60:8333 -50.106.40.231:8333 -52.29.0.37:8333 -52.76.192.246:8333 -54.152.192.179:8333 -54.169.64.174:8333 -54.175.160.22:8333 -54.199.128.0:8333 -58.96.171.129:8333 -58.161.238.57:8333 -60.251.195.221:8333 -61.35.225.19:8333 -62.43.130.178:8333 -62.65.39.12:8333 -62.107.200.30:8333 -62.133.194.2:8333 -62.181.238.186:8333 -62.183.22.50:8333 -62.210.85.120:8333 -62.210.162.89:8333 -62.238.34.125:8333 -64.25.171.73:8333 -64.27.166.30:8333 -64.53.137.101:8333 -64.71.72.44:8333 -64.83.225.146:8333 -64.121.3.163:8333 -64.203.102.86:8333 -65.94.131.59:8333 -65.188.136.233:8333 -66.11.162.218:8333 -66.23.228.133:8333 -66.90.137.89:8333 -66.114.33.49:8333 -66.150.105.77:8333 -66.172.10.4:8333 -66.194.38.250:8333 -66.194.38.253:8333 -66.194.38.254:8333 -66.231.97.172:8333 -66.240.237.155:8333 -67.159.13.34:8333 -67.205.74.206:8333 -67.221.193.55:8333 -67.227.72.17:8333 -68.65.120.53:8333 -68.65.205.226:9000 -68.144.4.34:8333 -69.39.49.199:8333 -69.50.171.205:8333 -69.65.41.21:8333 -69.113.98.61:8333 -69.119.97.39:8333 -69.146.70.124:8333 -69.193.71.2:8333 -70.46.10.237:8333 -70.80.200.187:8333 -70.185.97.117:8333 -71.254.160.25:8333 -72.28.203.5:8333 -72.52.130.110:8333 -72.83.194.122:8333 -72.128.32.167:8333 -72.179.136.80:8333 -72.235.38.70:8333 -74.50.44.193:8333 -74.72.60.83:8333 -74.80.234.116:8333 -74.207.233.193:8333 -75.112.233.128:8333 -75.118.166.197:8333 -75.140.0.241:8333 -75.159.240.66:8333 -75.174.5.26:8333 -76.72.160.252:8333 -76.72.160.254:8333 -76.74.170.112:8333 -76.79.201.54:8333 -76.175.166.164:8333 -76.179.105.27:8333 -77.68.37.200:8333 -77.234.49.196:8333 -77.247.229.93:8333 -78.24.72.78:8333 -78.47.32.147:8333 -78.84.100.95:8333 -78.121.69.23:8333 -78.129.167.5:8333 -78.193.96.155:8333 -79.19.37.179:8333 -79.132.230.144:8333 -79.133.43.63:8333 -79.134.201.66:8333 -79.169.35.235:8333 -80.57.227.14:8333 -80.64.65.87:8333 -80.86.92.70:8333 -80.100.203.151:8333 -80.101.32.121:8333 -80.161.178.73:8333 -80.240.129.170:8333 -81.7.11.50:8333 -81.7.11.55:8333 -81.17.17.40:9333 -81.30.39.83:8333 -81.90.36.7:9444 -81.136.224.77:8333 -81.162.231.211:8333 -81.184.0.143:8333 -81.198.128.86:8333 -82.11.33.229:8333 -82.79.128.134:8333 -82.118.233.111:8333 -82.135.139.30:8333 -82.199.102.10:8333 -82.221.106.17:8333 -82.221.108.21:8333 -82.221.108.27:8333 -83.137.41.3:8333 -83.142.197.168:8333 -83.143.130.19:8333 -83.150.9.196:8333 -83.183.17.191:8333 -83.227.173.83:8333 -83.230.5.15:8333 -83.233.105.151:443 -83.246.75.8:8333 -83.250.133.158:8333 -83.255.66.118:8334 -84.24.69.59:8333 -84.42.193.6:8333 -84.45.98.87:8333 -84.54.128.11:8333 -84.212.200.24:8333 -84.215.198.109:8333 -84.230.4.177:8333 -85.95.228.83:8333 -85.95.228.123:8333 -85.114.128.134:8333 -85.214.66.168:8333 -85.214.147.162:8333 -85.243.168.4:8333 -86.1.0.18:8333 -87.79.77.106:8333 -87.91.156.110:8333 -87.236.196.222:8333 -88.85.75.152:8333 -88.87.1.230:8333 -88.87.92.102:8333 -88.89.69.202:8333 -88.97.72.229:8333 -88.164.117.99:8333 -88.198.32.131:8333 -88.202.230.87:8333 -88.214.193.154:8343 -88.214.194.226:8343 -89.10.155.88:8333 -89.46.101.44:8333 -89.163.224.212:8333 -89.174.248.20:8333 -89.202.231.198:8333 -89.212.75.6:8333 -90.149.38.172:8333 -90.169.106.139:8333 -91.64.101.150:8333 -91.65.196.179:8333 -91.121.80.17:8333 -91.126.77.77:8333 -91.145.76.156:8333 -91.152.150.35:8333 -91.192.137.17:8333 -91.196.170.110:8333 -91.197.44.133:8333 -91.207.68.144:8333 -91.210.105.28:8333 -91.211.102.101:8333 -91.211.106.34:8333 -91.214.200.205:8333 -91.220.43.146:8333 -91.222.71.89:8333 -91.224.140.242:8333 -91.229.76.14:8333 -92.27.7.209:8333 -92.51.167.88:8333 -92.247.229.163:8333 -93.84.114.106:8333 -93.113.36.172:8333 -93.188.224.253:8333 -94.75.239.69:8333 -94.190.227.112:8333 -94.214.2.74:8333 -94.224.162.65:8333 -94.236.198.253:8333 -94.242.229.158:8333 -95.84.138.99:8333 -95.95.168.87:8333 -95.110.234.93:8333 -95.130.9.200:8333 -95.165.168.168:8333 -95.170.235.254:8333 -95.211.130.154:8333 -96.46.68.104:8333 -96.127.202.148:8333 -97.76.171.35:8333 -98.160.160.67:8333 -99.126.197.187:8333 -99.198.173.1:8333 -101.100.174.138:8333 -101.164.201.208:8333 -103.224.165.48:8333 -104.128.225.223:8333 -104.128.228.252:8333 -104.131.192.94:8333 -104.155.45.201:8334 -104.194.28.195:8663 -104.211.1.27:8333 -104.221.38.177:8333 -104.236.9.79:8333 -104.236.129.178:8333 -104.236.186.249:8333 -104.236.194.15:8333 -104.238.128.214:8333 -104.238.130.182:8333 -106.38.234.84:8333 -106.185.36.204:8333 -106.185.38.67:8333 -107.6.4.145:8333 -107.150.2.6:8333 -107.150.40.234:8333 -107.170.13.184:8333 -107.181.250.216:8333 -107.191.101.111:8333 -107.191.106.115:8333 -108.59.12.163:8333 -108.161.129.247:8333 -109.193.160.140:8333 -109.197.13.54:8333 -109.230.7.248:8333 -109.234.106.191:8333 -109.236.137.80:8333 -109.251.161.121:8333 -112.65.231.226:8333 -115.70.166.57:8333 -115.159.42.80:8333 -117.18.73.34:8333 -118.67.201.40:8333 -118.100.86.246:8333 -118.110.104.152:8333 -119.224.64.141:8333 -120.55.193.136:8333 -122.106.169.178:8333 -123.203.174.15:8333 -123.255.232.94:8333 -124.148.165.165:8333 -124.232.141.31:8333 -128.30.92.69:8333 -128.39.141.182:8333 -128.84.167.20:8333 -128.111.73.10:8333 -128.127.38.195:8333 -128.140.224.162:8333 -128.199.101.104:8333 -128.233.224.35:8333 -128.253.3.193:20020 -130.180.228.138:8333 -130.185.144.213:8333 -130.255.73.207:8333 -133.218.233.11:8333 -134.249.128.23:8333 -136.159.234.234:8333 -137.116.160.176:8333 -139.162.2.145:8333 -139.162.23.117:8333 -141.134.69.253:8333 -141.255.162.215:8333 -144.122.163.187:8333 -145.131.3.54:8333 -145.255.4.94:8333 -146.0.32.101:8337 -147.83.72.91:8333 -148.103.28.68:8333 -149.5.32.102:8333 -149.210.164.195:8333 -150.101.163.241:8333 -151.236.11.189:8333 -152.3.136.56:8333 -154.20.208.25:8333 -158.181.104.149:8333 -159.253.96.226:8333 -160.36.130.180:8333 -162.209.1.233:8333 -162.209.4.125:8333 -162.209.106.123:8333 -162.210.198.184:8333 -162.248.99.164:53011 -162.248.102.117:8333 -162.251.108.53:8333 -163.44.2.48:8333 -163.158.36.17:8333 -166.230.71.67:8333 -167.160.36.62:8333 -167.160.169.92:8333 -168.93.129.220:8333 -169.55.99.84:8333 -169.228.66.43:8333 -172.9.169.242:8333 -173.32.11.194:8333 -173.230.228.136:8333 -173.246.107.34:8333 -173.254.235.34:8333 -174.0.128.222:8333 -174.25.130.148:8333 -174.50.64.101:8333 -175.140.232.141:8333 -176.36.37.62:8333 -176.46.9.96:8333 -176.124.110.27:8333 -177.39.16.102:8333 -178.17.173.2:8333 -178.62.5.248:8333 -178.62.70.16:8333 -178.62.203.185:8333 -178.79.160.118:8333 -178.169.206.244:8333 -178.193.234.62:8333 -178.199.96.108:8333 -178.254.18.96:8333 -178.254.34.161:8333 -178.255.41.123:8333 -180.210.34.58:9801 -182.92.226.212:8333 -182.171.246.142:8333 -184.23.8.9:8333 -184.58.162.35:8333 -184.154.9.170:8333 -185.8.238.165:8333 -185.24.97.11:8333 -185.31.137.139:8333 -185.38.44.64:8333 -185.53.128.180:8333 -185.53.129.244:8333 -185.77.129.119:8333 -185.77.129.156:8333 -185.82.203.92:8333 -188.20.97.18:8333 -188.126.8.14:8333 -188.138.33.239:8333 -188.155.136.70:8333 -188.166.229.112:8333 -188.182.108.129:8333 -188.226.225.174:8010 -188.242.171.8:8333 -188.243.4.139:8333 -190.10.9.234:8333 -190.10.10.147:8333 -190.81.160.184:8333 -190.85.201.37:8333 -192.34.227.230:8333 -192.77.189.200:8333 -192.124.224.7:8333 -192.146.137.1:8333 -192.203.228.71:8333 -192.206.202.20:8333 -193.0.109.3:8333 -193.41.229.130:8333 -193.41.229.156:8333 -193.49.43.219:8333 -193.147.71.120:8333 -193.179.65.233:8333 -193.183.99.46:8333 -193.192.37.135:8333 -193.234.224.195:8333 -194.58.108.213:8333 -194.187.96.2:8333 -194.255.31.59:8333 -195.36.6.101:8333 -195.58.238.243:8333 -195.197.175.190:8333 -195.239.1.66:8333 -198.48.196.230:8333 -198.50.192.160:8333 -198.57.210.27:8333 -198.84.195.179:8333 -198.167.140.8:8333 -198.204.224.106:8333 -199.127.226.245:8333 -199.201.110.8:8333 -199.233.234.90:8333 -200.116.98.185:8333 -202.60.70.18:8333 -203.151.140.14:8333 -204.112.203.52:8333 -205.200.247.149:8333 -207.226.141.253:8333 -207.255.42.202:8333 -208.53.164.19:8333 -208.66.68.127:8333 -208.66.68.130:8333 -208.71.171.232:8341 -208.76.200.200:8333 -208.82.98.189:8333 -208.85.193.31:8333 -208.111.48.41:8333 -208.111.48.45:8333 -209.34.232.72:8333 -209.81.9.223:8333 -209.90.224.2:8333 -209.90.224.4:8333 -209.126.98.174:8333 -209.136.72.69:8333 -209.195.4.74:8333 -209.197.13.62:8333 -211.72.227.8:8333 -212.51.144.42:8333 -212.71.233.127:8333 -212.126.14.122:8333 -212.159.44.50:8333 -213.5.36.58:8333 -213.57.33.10:8333 -213.66.205.194:8333 -213.136.73.125:8333 -213.155.3.216:8333 -213.155.7.24:8333 -213.167.17.6:8333 -213.223.138.13:8333 -216.15.78.182:8333 -216.38.129.164:8333 -216.48.168.8:8333 -216.169.141.169:8333 -216.245.206.181:8333 -216.249.204.161:8333 -216.250.138.230:8333 -217.11.225.189:8333 -217.12.34.158:8333 -217.12.202.33:8333 -217.20.171.43:8333 -217.23.1.126:8333 -217.23.11.138:8333 -217.111.66.79:8333 -217.155.202.191:8333 -217.158.9.102:8333 -217.172.32.18:20993 -220.245.196.37:8333 -[2001:1291:2bf:1::100]:8333 -[2001:1620:f00:282::2]:8333 -[2001:1620:f00:8282::1]:8333 -[2001:19f0:5000:8de8:5400:ff:fe12:55e4]:8333 -[2001:19f0:6c00:9103:5400:ff:fe10:a8d3]:8333 -[2001:1b60:3:172:142b:6dff:fe7a:117]:8333 -[2001:410:a000:4050:8463:90b0:fffb:4e58]:8333 -[2001:4128:6135:2010:21e:bff:fee8:a3c0]:8333 -[2001:41d0:1008:761::17c]:8333 -[2001:41d0:1:45d8::1]:8333 -[2001:41d0:1:6cd3::]:8333 -[2001:41d0:1:8b26::1]:8333 -[2001:41d0:1:afda::]:8200 -[2001:41d0:1:b26b::1]:8333 -[2001:41d0:1:c139::1]:8333 -[2001:41d0:1:c8d7::1]:8333 -[2001:41d0:1:f59f::33]:8333 -[2001:41d0:1:f7cc::1]:8333 -[2001:41d0:2:1021::1]:8333 -[2001:41d0:2:37c3::]:8200 -[2001:41d0:2:4797:2323:2323:2323:2323]:8333 -[2001:41d0:2:53df::]:8333 -[2001:41d0:2:9c94::1]:8333 -[2001:41d0:2:9d3e::1]:8333 -[2001:41d0:2:a24f::]:8333 -[2001:41d0:2:a35a::]:8333 -[2001:41d0:2:b2b8::]:8333 -[2001:41d0:2:c1d9::]:8333 -[2001:41d0:2:c6e::]:8333 -[2001:41d0:2:c9bf::]:8333 -[2001:41d0:2:f1a5::]:8333 -[2001:41d0:52:a00::105f]:8333 -[2001:41d0:52:cff::6f5]:8333 -[2001:41d0:52:d00::6e2]:8333 -[2001:41d0:8:3e75::1]:8333 -[2001:41d0:8:62ab::1]:8333 -[2001:41d0:8:6728::]:8333 -[2001:41d0:8:b30a::1]:8333 -[2001:41d0:8:bc26::1]:8333 -[2001:41d0:8:be9a::1]:8333 -[2001:41d0:8:d984::]:8333 -[2001:41d0:8:eb8b::]:8333 -[2001:41d0:a:13a2::1]:8333 -[2001:41d0:a:2b18::1]:8333 -[2001:41d0:a:2d14::]:8333 -[2001:41d0:a:4558::1df2:76d3]:8333 -[2001:41d0:a:4aaa::]:8333 -[2001:41d0:a:635b::1]:8333 -[2001:41d0:a:63d8::1]:8333 -[2001:41d0:a:6c29::1]:8333 -[2001:41d0:a:f9cd::1]:8333 -[2001:41d0:d:20a4::]:8333 -[2001:41d0:e:26b::1]:8333 -[2001:41d0:fc8c:a200:7a24:afff:fe9d:c69b]:8333 -[2001:41f0:61::7]:8333 -[2001:41f0::2]:8333 -[2001:44b8:41bd:6101:148e:4022:4950:e861]:8333 -[2001:470:1:2f9:0:1:107a:a301]:8333 -[2001:470:1f0b:ad6::2]:8333 -[2001:470:1f11:12d5::ae1:5611]:8333 -[2001:470:1f14:7d::2]:8333 -[2001:470:27:ce::2]:8333 -[2001:470:41:6::2]:8333 -[2001:470:507d:0:6ab5:99ff:fe73:ac18]:8333 -[2001:470:583e::2a]:8333 -[2001:470:5f:5f::232]:8333 -[2001:470:66:119::2]:8333 -[2001:470:6c4f::cafe]:8333 -[2001:470:6f:327:913b:7fe:8545:a4f5]:8333 -[2001:470:7dda:1::1]:8333 -[2001:470:95c1::2]:8333 -[2001:470:b1d0:ffff::1000]:8333 -[2001:470:d00d:0:3664:a9ff:fe9a:5150]:8333 -[2001:470:fab7:1::1]:8333 -[2001:4800:7819:104:be76:4eff:fe05:c828]:8333 -[2001:4800:7819:104:be76:4eff:fe05:c9a0]:8333 -[2001:4801:7819:74:b745:b9d5:ff10:a61a]:8333 -[2001:4801:7819:74:b745:b9d5:ff10:aaec]:8333 -[2001:4801:7828:104:be76:4eff:fe10:1325]:8333 -[2001:4802:7800:1:be76:4eff:fe20:f023]:8333 -[2001:4802:7800:2:30d7:1775:ff20:1858]:8333 -[2001:4802:7800:2:be76:4eff:fe20:6c26]:8333 -[2001:4802:7802:101:be76:4eff:fe20:256]:8333 -[2001:4802:7802:103:be76:4eff:fe20:2de8]:8333 -[2001:4830:1100:2e8::2]:8333 -[2001:4b98:dc2:41:216:3eff:fe56:f659]:8333 -[2001:4ba0:fffa:5d::93]:8333 -[2001:4ba0:ffff:1be:1:1005:0:1]:8333 -[2001:4dd0:ff00:867f::3]:8333 -[2001:4dd0:ff00:9a67::9]:8333 -[2001:5c0:1400:b::3cc7]:8333 -[2001:610:1b19::3]:8333 -[2001:610:600:a41::2]:8333 -[2001:67c:26b4::]:8333 -[2001:8d8:840:500::39:1ae]:8333 -[2001:8d8:965:4a00::10:9343]:8333 -[2001:980:4650:1:2e0:53ff:fe13:2449]:8333 -[2001:981:46:1:ba27:ebff:fe5b:edee]:8333 -[2001:9c8:53e9:369a:226:2dff:fe1b:7472]:8333 -[2001:9d8:cafe:3::87]:8333 -[2001:b10:11:21:3e07:54ff:fe48:7248]:8333 -[2001:ba8:1f1:f34c::2]:8333 -[2001:bc8:2310:100::1]:8333 -[2001:bc8:3427:101:7a4f:8be:2611:6e79]:8333 -[2001:bc8:3505:200::1]:8333 -[2001:cc0:a004::30:1d]:8333 -[2001:e42:102:1209:153:121:76:171]:8333 -[2002:17ea:14eb::17ea:14eb]:8333 -[2002:2f8:2bc5::2f8:2bc5]:8333 -[2002:4047:482c::4047:482c]:8333 -[2002:45c3:8cca::45c3:8cca]:8333 -[2002:46bb:8a41:0:226:b0ff:feed:5f12]:8888 -[2002:46bb:8c3c:0:8d55:8fbb:15fa:f4e0]:8765 -[2002:4c48:a0fe::4c48:a0fe]:8333 -[2002:4d44:25c8::4d44:25c8]:8333 -[2002:505f:aaa2::505f:aaa2]:8333 -[2002:5bc1:799d::5bc1:799d]:8333 -[2002:6dec:5472::6dec:5472]:8333 -[2002:8c6d:6521:9617:12bf:48ff:fed8:1724]:8333 -[2002:ac52:94e2::ac52:94e2]:8333 -[2002:af7e:3eca::af7e:3eca]:8333 -[2002:b009:20c5::b009:20c5]:8333 -[2002:c06f:39a0::c06f:39a0]:8333 -[2002:c23a:738a::c23a:738a]:8333 -[2002:c70f:7442::c70f:7442]:8333 -[2002:cec5:be4f::cec5:be4f]:8333 -[2002:d149:9e3a::d149:9e3a]:8333 -[2002:d917:ca5::d917:ca5]:8333 -[2400:8900::f03c:91ff:fe50:153f]:8333 -[2400:8900::f03c:91ff:fe6e:823e]:8333 -[2400:8900::f03c:91ff:fea8:1934]:8333 -[2400:8901::f03c:91ff:fe26:c4d6]:8333 -[2400:8901::f03c:91ff:fec8:4280]:8333 -[2400:8901::f03c:91ff:fec8:660f]:8333 -[2401:1800:7800:102:be76:4eff:fe1c:559]:8333 -[2401:1800:7800:102:be76:4eff:fe1c:a7d]:8333 -[2405:aa00:2::40]:8333 -[2600:3c00::f03c:91ff:fe18:59b2]:8333 -[2600:3c00::f03c:91ff:fe26:bfb6]:8333 -[2600:3c00::f03c:91ff:fe33:88e3]:8333 -[2600:3c00::f03c:91ff:fe6e:7297]:8333 -[2600:3c00::f03c:91ff:fe84:8a6e]:8333 -[2600:3c01::f03c:91ff:fe18:6adf]:8333 -[2600:3c01::f03c:91ff:fe26:c4b8]:8333 -[2600:3c01::f03c:91ff:fe3b:1f76]:8333 -[2600:3c01::f03c:91ff:fe50:5e06]:8333 -[2600:3c01::f03c:91ff:fe61:289b]:8333 -[2600:3c01::f03c:91ff:fe69:89e9]:8333 -[2600:3c01::f03c:91ff:fe84:ac15]:8333 -[2600:3c01::f03c:91ff:fe98:68bb]:8333 -[2600:3c02::f03c:91ff:fe26:713]:8333 -[2600:3c02::f03c:91ff:fe26:c49e]:8333 -[2600:3c02::f03c:91ff:fe84:97d8]:8333 -[2600:3c02::f03c:91ff:fec8:8feb]:8333 -[2600:3c03::f03c:91ff:fe18:da80]:8333 -[2600:3c03::f03c:91ff:fe26:c49b]:8333 -[2600:3c03::f03c:91ff:fe50:5fa7]:8333 -[2600:3c03::f03c:91ff:fe67:d2e]:8333 -[2600:3c03::f03c:91ff:fe6e:1803]:8333 -[2600:3c03::f03c:91ff:fec8:4bbe]:8333 -[2600:3c03::f03c:91ff:fee4:4e16]:8333 -[2601:18d:8300:58a6::2e4]:8333 -[2601:240:4600:40c0:250:56ff:fea4:6305]:8333 -[2601:581:c200:a719:542c:9cd5:4852:f7d9]:8333 -[2601:647:4900:85f1:ca2a:14ff:fe51:bb35]:8333 -[2601:c2:c002:b300:54a0:15b5:19f7:530d]:8333 -[2602:306:ccff:ad7f:b116:52be:64ba:db3a]:8333 -[2602:ae:1982:9400:846:f78c:fec:4d57]:8333 -[2602:ffc5:1f::1f:2d61]:8333 -[2602:ffc5:1f::1f:9211]:8333 -[2602:ffc5::75d5:c1c3]:8333 -[2602:ffc5::ffc5:b844]:8333 -[2602:ffe8:100:2::457:936b]:8333 -[2602:ffe8:100:2::9d20:2e3c]:8333 -[2602:ffea:1001:72b::578b]:8333 -[2602:ffea:a::24c4:d9fd]:8333 -[2604:0:c1:100:1ec1:deff:fe54:2235]:8333 -[2604:180:1:1af::42a9]:8333 -[2604:180:3:702::c9de]:8333 -[2604:4080:1114:0:3285:a9ff:fe93:850c]:8333 -[2604:6000:ffc0:3c:64a3:94d0:4f1d:1da8]:8333 -[2605:6000:f380:9a01:ba09:8aff:fed4:3511]:8333 -[2605:6001:e00f:7b00:c587:6d91:6eff:eeba]:8333 -[2605:f700:c0:1::25c3:2a3e]:8333 -[2606:6000:a441:9903:5054:ff:fe78:66ff]:8333 -[2607:5300:100:200::1c83]:9334 -[2607:5300:10::a1]:8333 -[2607:5300:60:1c2f::1]:8333 -[2607:5300:60:2b90::1]:8333 -[2607:5300:60:3320::1]:8333 -[2607:5300:60:385::1]:8333 -[2607:5300:60:4a85::]:8333 -[2607:5300:60:65e4::]:8333 -[2607:5300:60:6918::]:8333 -[2607:5300:60:711a:78::a7b5]:8333 -[2607:5300:60:714::1]:8333 -[2607:5300:60:870::1]:8333 -[2607:5300:60:952e:3733::1414]:8333 -[2607:f1c0:848:1000::48:943c]:8333 -[2607:f2e0:f:5df::2]:8333 -[2607:f748:1200:f8:21e:67ff:fe99:8f07]:8333 -[2607:f948:0:1::7]:8333 -[2607:ff68:100:36::131]:8333 -[2803:6900:1::117]:8333 -[2a00:1098:0:80:1000:25:0:1]:8333 -[2a00:1178:2:43:5054:ff:fe84:f86f]:8333 -[2a00:1178:2:43:5054:ff:fee7:2eb6]:8333 -[2a00:1178:2:43:8983:cc27:d72:d97a]:8333 -[2a00:1328:e100:cc42:230:48ff:fe92:55c]:8333 -[2a00:14f0:e000:80d2:cd1a::1]:8333 -[2a00:1630:2:1802:188:122:91:11]:8333 -[2a00:18e0:0:1800::1]:8333 -[2a00:18e0:0:dcc5:109:234:106:191]:8333 -[2a00:1a28:1157:87::94c7]:8333 -[2a00:1ca8:37::a5fc:40d1]:8333 -[2a00:1ca8:37::ab6d:ce2c]:8333 -[2a00:7143:100:0:216:3eff:fe2e:74a3]:8333 -[2a00:7143:100:0:216:3eff:fed3:5c21]:8333 -[2a00:7c80:0:45::123]:8333 -[2a00:dcc0:eda:98:183:193:c382:6bdb]:8333 -[2a00:dcc0:eda:98:183:193:f72e:d943]:8333 -[2a00:f820:17::4af:1]:8333 -[2a00:f940:2:1:2::101d]:8333 -[2a00:f940:2:1:2::6ac]:8333 -[2a01:1b0:7999:402::131]:8333 -[2a01:238:42dd:f900:7a6c:2bc6:4041:c43]:8333 -[2a01:238:4313:6300:2189:1c97:696b:5ea]:8333 -[2a01:488:66:1000:5c33:91f9:0:1]:8333 -[2a01:488:66:1000:b01c:178d:0:1]:8333 -[2a01:4f8:100:34ce::2]:8333 -[2a01:4f8:100:34e4::2]:8333 -[2a01:4f8:100:44e7::2]:8333 -[2a01:4f8:100:510e::2]:8333 -[2a01:4f8:100:5128::2]:8333 -[2a01:4f8:110:5105::2]:8333 -[2a01:4f8:110:516c::2]:8333 -[2a01:4f8:120:43e4::2]:8333 -[2a01:4f8:120:62e6::2]:8333 -[2a01:4f8:120:702e::2]:8333 -[2a01:4f8:120:8203::2]:8333 -[2a01:4f8:121:234d::2]:8333 -[2a01:4f8:121:261::2]:8333 -[2a01:4f8:130:11ea::2]:8333 -[2a01:4f8:130:3332::2]:8333 -[2a01:4f8:130:40ab::2]:8333 -[2a01:4f8:130:632c::2]:8333 -[2a01:4f8:130:6366::2]:8333 -[2a01:4f8:130:934f::2]:8333 -[2a01:4f8:131:33ad:fea1::666]:8333 -[2a01:4f8:140:2195::2]:8333 -[2a01:4f8:140:6333::2]:8333 -[2a01:4f8:140:930d::2]:8333 -[2a01:4f8:140:93b0::2]:8333 -[2a01:4f8:141:1167::2]:8333 -[2a01:4f8:141:186::2]:8333 -[2a01:4f8:141:53f0::2]:8333 -[2a01:4f8:150:336a::2]:8333 -[2a01:4f8:150:72ee::4202]:8333 -[2a01:4f8:150:8324::2]:9001 -[2a01:4f8:151:21ca::2]:8333 -[2a01:4f8:151:41c2:0:5404:a67e:f250]:8333 -[2a01:4f8:151:5128::2]:8333 -[2a01:4f8:151:52c6::154]:8333 -[2a01:4f8:151:6347::2]:9001 -[2a01:4f8:160:5136::2]:8333 -[2a01:4f8:160:72c5::2858:e1c5]:8333 -[2a01:4f8:160:72c5::593b:60d5]:8333 -[2a01:4f8:160:814f::2]:8333 -[2a01:4f8:161:13d0::2]:8333 -[2a01:4f8:161:228f::2]:8333 -[2a01:4f8:161:51c4::2]:8333 -[2a01:4f8:161:60a7::2]:8333 -[2a01:4f8:161:7026::2]:8333 -[2a01:4f8:161:9184::2]:8333 -[2a01:4f8:162:2108::2]:8333 -[2a01:4f8:162:218c::2]:8333 -[2a01:4f8:162:4443::2]:8333 -[2a01:4f8:162:51a3::2]:8333 -[2a01:4f8:171:b93::2]:8333 -[2a01:4f8:190:1483::1]:8333 -[2a01:4f8:190:4495::2]:8333 -[2a01:4f8:190:64c9::2]:8333 -[2a01:4f8:190:91ce::2]:8333 -[2a01:4f8:191:2194::83]:8333 -[2a01:4f8:191:40e8::2]:8333 -[2a01:4f8:191:44b4::2]:8333 -[2a01:4f8:191:8242::2]:8333 -[2a01:4f8:191:83a2::2]:8333 -[2a01:4f8:192:11b2::2]:8333 -[2a01:4f8:192:216c::2]:8333 -[2a01:4f8:192:22b3::2]:8333 -[2a01:4f8:192:440b::2]:8333 -[2a01:4f8:192:db::2]:8333 -[2a01:4f8:200:1012::2]:8333 -[2a01:4f8:200:23d1::dead:beef]:8333 -[2a01:4f8:200:506d::2]:8333 -[2a01:4f8:200:51f0::2]:8333 -[2a01:4f8:200:5389::2]:8333 -[2a01:4f8:200:53e3::2]:8333 -[2a01:4f8:200:6344::2]:8333 -[2a01:4f8:200:6396::2]:8333 -[2a01:4f8:200:63af::119]:8333 -[2a01:4f8:200:71e3:78b4:f3ff:fead:e8cf]:8333 -[2a01:4f8:201:214c::2]:8333 -[2a01:4f8:201:233:1::3]:8333 -[2a01:4f8:201:3e3::2]:8333 -[2a01:4f8:201:6011::4]:8333 -[2a01:4f8:201:60d5::2]:8333 -[2a01:4f8:202:265::2]:8333 -[2a01:4f8:202:3115::2]:8333 -[2a01:4f8:202:31e3::2]:8333 -[2a01:4f8:202:31ef::2]:8333 -[2a01:4f8:202:3392::2]:8333 -[2a01:4f8:202:53c3::2]:8333 -[2a01:4f8:202:63f4::2]:8333 -[2a01:4f8:202:7227::2]:8333 -[2a01:4f8:210:2227::2]:8333 -[2a01:4f8:210:24aa::2]:8333 -[2a01:4f8:211:14cf::2]:8333 -[2a01:4f8:211:181b::2]:8333 -[2a01:4f8:212:289e::2]:8333 -[2a01:4f8:212:33db::2]:18333 -[2a01:4f8:a0:112f::2]:8333 -[2a01:4f8:a0:3174::2]:8333 -[2a01:4f8:a0:328c::2]:8333 -[2a01:4f8:a0:5243::2]:8333 -[2a01:4f8:c17:19b9::2]:8333 -[2a01:4f8:c17:1a41::2]:8333 -[2a01:4f8:c17:1a92::2]:8333 -[2a01:4f8:c17:273::2]:8333 -[2a01:4f8:c17:435::2]:8333 -[2a01:4f8:c17:755::2]:8333 -[2a01:4f8:c17:b54::2]:8333 -[2a01:4f8:d16:9384::2]:8333 -[2a01:608:ffff:a009:8bf5:879d:e51a:f837]:8333 -[2a01:680:10:10:f2de:f1ff:fec9:dc0]:8333 -[2a01:7c8:aaac:1f6:5054:ff:fe30:e585]:8333 -[2a01:7c8:aaac:20b:5054:ff:fe24:435e]:8333 -[2a01:7c8:aaac:43d:5054:ff:fe4e:3dd4]:8333 -[2a01:7c8:aaad:256::1]:8333 -[2a01:7c8:aab6:ea:5054:ff:feff:eac3]:8333 -[2a01:7c8:aab9:5a:5054:ff:fe89:7b26]:8333 -[2a01:7c8:aabc:2c8:5054:ff:fe35:6581]:8333 -[2a01:7e00::f03c:91ff:fe18:301e]:8333 -[2a01:7e00::f03c:91ff:fe18:3942]:8333 -[2a01:7e00::f03c:91ff:fe26:8c87]:8333 -[2a01:7e00::f03c:91ff:fe50:6206]:8333 -[2a01:7e00::f03c:91ff:fe67:559d]:8333 -[2a01:7e00::f03c:91ff:fe84:434f]:8333 -[2a01:7e00::f03c:91ff:fe89:1143]:8333 -[2a01:7e00::f03c:91ff:fe98:2505]:8333 -[2a01:7e00::f03c:91ff:fedb:352e]:8333 -[2a01:7e01::f03c:91ff:fec8:d7b5]:8333 -[2a01:e34:ee33:1640:c504:f677:b28a:ba42]:8333 -[2a01:e35:2e7e:bc0:e079:f55e:cef3:b5d7]:8333 -[2a01:e35:2ee5:610:21f:d0ff:fe4e:7460]:8333 -[2a01:e35:8a3f:47c0:c617:feff:fe3c:9fbd]:8333 -[2a01:e35:8aca:6a0:211:aff:fe5e:295e]:8333 -[2a02:180:a:18:81:7:11:50]:8333 -[2a02:1810:1d87:6a00:5604:a6ff:fe60:d87d]:8333 -[2a02:2168:1144:5c01:d63d:7eff:fedd:4f8e]:8333 -[2a02:2498:6d7b:7001:b508:b39d:2cea:5b7a]:8333 -[2a02:2528:503:2::15]:8333 -[2a02:2528:fa:1a56:216:44ff:fe6a:d112]:8333 -[2a02:27f8:2012:0:e9f7:268f:c441:6129]:8333 -[2a02:348:86:3011::1]:8333 -[2a02:4780:1:1::1:8a01]:8333 -[2a02:578:5002:116::2]:8333 -[2a02:6080::1:190b:69e3]:8333 -[2a02:6080::1:e893:d9d6]:8333 -[2a02:770:4000::139]:8333 -[2a02:7aa0:1201::deb3:81a2]:8333 -[2a02:8010:b001::5860:59b5]:8333 -[2a02:810d:21c0:f00:a248:1cff:feb8:5348]:8333 -[2a02:a50::21b:24ff:fe93:4e39]:8333 -[2a02:a80:0:1200::2]:8333 -[2a02:c200:0:10:2:1:5830:1]:8333 -[2a02:c200:0:10:2:5:4692:1]:8333 -[2a02:c200:0:10:3:0:7158:1]:8333 -[2a02:c200:0:10::2244:1]:8333 -[2a02:c200:1:10:2:3:3339:1]:8333 -[2a02:c200:1:10:2:3:7844:1]:8333 -[2a02:c200:1:10:2:5:6288:1]:8333 -[2a02:c200:1:10:3:0:5912:1]:8333 -[2a03:4000:2:496::8]:8333 -[2a03:4000:6:8009::1]:8333 -[2a03:4000:6:8063::bcd0]:8333 -[2a03:4900:fffc:b::2]:8333 -[2a03:b0c0:1:d0::d:5001]:8333 -[2a03:f80:ed15:149:154:155:235:1]:8333 -[2a03:f80:ed15:149:154:155:241:1]:8333 -[2a03:f80:ed16:ca7:ea75:b12d:2af:9e2a]:8333 -[2a04:1980:3100:1aab:290:faff:fe70:a3d8]:8333 -[2a04:1980:3100:1aab:e61d:2dff:fe29:f590]:8333 -[2a04:2f80:6:200::89]:8333 -[2a04:ac00:1:4a0b:5054:ff:fe00:5af5]:8333 -[2a04:ad80:0:68::35da]:8333 -3ffk7iumtx3cegbi.onion:8333 -3nmbbakinewlgdln.onion:8333 -4j77gihpokxu2kj4.onion:8333 -546esc6botbjfbxb.onion:8333 -5at7sq5nm76xijkd.onion:8333 -77mx2jsxaoyesz2p.onion:8333 -7g7j54btiaxhtsiy.onion:8333 -a6obdgzn67l7exu3.onion:8333 -ab64h7olpl7qpxci.onion:8333 -am2a4rahltfuxz6l.onion:8333 -azuxls4ihrr2mep7.onion:8333 -bitcoin7bi4op7wb.onion:8333 -bitcoinostk4e4re.onion:8333 -bk7yp6epnmcllq72.onion:8333 -bmutjfrj5btseddb.onion:8333 -ceeji4qpfs3ms3zc.onion:8333 -clexmzqio7yhdao4.onion:8333 -gb5ypqt63du3wfhn.onion:8333 -h2vlpudzphzqxutd.onion:8333 -n42h7r6oumcfsbrs.onion:4176 -ncwk3lutemffcpc4.onion:8333 -okdzjarwekbshnof.onion:8333 -pjghcivzkoersesd.onion:8333 -rw7ocjltix26mefn.onion:8333 -uws7itep7o3yinxo.onion:8333 -vk3qjdehyy4dwcxw.onion:8333 -vqpye2k5rcqvj5mq.onion:8333 -wpi7rpvhnndl52ee.onion:8333 + + diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt index 98365ee50..f71c31fcc 100644 --- a/contrib/seeds/nodes_test.txt +++ b/contrib/seeds/nodes_test.txt @@ -1,11 +1,4 @@ # List of fixed seed nodes for testnet # Onion nodes -thfsmmn2jbitcoin.onion -it2pj4f7657g3rhi.onion -nkf5e6b7pl4jfd4a.onion -4zhkir2ofl7orfom.onion -t6xj6wilh4ytvcs7.onion -i6y6ivorwakd7nw3.onion -ubqj4rsu3nqtxmtp.onion diff --git a/contrib/spendfrom/README.md b/contrib/spendfrom/README.md index a51c9ce21..6da845455 100644 --- a/contrib/spendfrom/README.md +++ b/contrib/spendfrom/README.md @@ -7,7 +7,7 @@ address (or addresses). Depends on [jsonrpc](http://json-rpc.org/). spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \ - --fee=fee --datadir=/path/to/.dashcore --testnet --dry_run + --fee=fee --datadir=/path/to/.neobytescore --testnet --dry_run With no arguments, outputs a list of amounts associated with addresses. @@ -16,7 +16,7 @@ With arguments, sends coins received by the `FROMADDRESS` addresses to the `TOAD ### Notes ### - You may explicitly specify how much fee to pay (a fee more than 1% of the amount -will fail, though, to prevent dash-losing accidents). Spendfrom may fail if +will fail, though, to prevent neobytes-losing accidents). Spendfrom may fail if it thinks the transaction would never be confirmed (if the amount being sent is too small, or if the transaction is too many bytes for the fee). diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index 51a8422c3..dd5395c35 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -1,13 +1,13 @@ #!/usr/bin/env python # -# Use the raw transactions API to spend dashs received on particular addresses, +# Use the raw transactions API to spend neobytes received on particular addresses, # and send any change back to that same address. # # Example usage: # spendfrom.py # Lists available funds # spendfrom.py --from=ADDRESS --to=ADDRESS --amount=11.00 # -# Assumes it will talk to a dashd or Dash-Qt running +# Assumes it will talk to a neobytesd or NeoBytes-Qt running # on localhost. # # Depends on jsonrpc @@ -33,15 +33,15 @@ def check_json_precision(): raise RuntimeError("JSON encode/decode loses precision") def determine_db_dir(): - """Return the default location of the Dash Core data directory""" + """Return the default location of the NeoBytes Core data directory""" if platform.system() == "Darwin": - return os.path.expanduser("~/Library/Application Support/DashCore/") + return os.path.expanduser("~/Library/Application Support/NeoBytesCore/") elif platform.system() == "Windows": - return os.path.join(os.environ['APPDATA'], "DashCore") - return os.path.expanduser("~/.dashcore") + return os.path.join(os.environ['APPDATA'], "NeoBytesCore") + return os.path.expanduser("~/.neobytescore") def read_bitcoin_config(dbdir): - """Read the dash.conf file from dbdir, returns dictionary of settings""" + """Read the neobytes.conf file from dbdir, returns dictionary of settings""" from ConfigParser import SafeConfigParser class FakeSecHead(object): @@ -59,20 +59,20 @@ def read_bitcoin_config(dbdir): return s config_parser = SafeConfigParser() - config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "dash.conf")))) + config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "neobytes.conf")))) return dict(config_parser.items("all")) def connect_JSON(config): - """Connect to a Dash Core JSON-RPC server""" + """Connect to a NeoBytes Core JSON-RPC server""" testnet = config.get('testnet', '0') testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False if not 'rpcport' in config: - config['rpcport'] = 19998 if testnet else 9998 + config['rpcport'] = 12426 if testnet else 11426 connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport']) try: result = ServiceProxy(connect) # ServiceProxy is lazy-connect, so send an RPC command mostly to catch connection errors, - # but also make sure the dashd we're talking to is/isn't testnet: + # but also make sure the neobytesd we're talking to is/isn't testnet: if result.getmininginfo()['testnet'] != testnet: sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n") sys.exit(1) @@ -81,36 +81,36 @@ def connect_JSON(config): sys.stderr.write("Error connecting to RPC server at "+connect+"\n") sys.exit(1) -def unlock_wallet(dashd): - info = dashd.getinfo() +def unlock_wallet(neobytesd): + info = neobytesd.getinfo() if 'unlocked_until' not in info: return True # wallet is not encrypted t = int(info['unlocked_until']) if t <= time.time(): try: passphrase = getpass.getpass("Wallet is locked; enter passphrase: ") - dashd.walletpassphrase(passphrase, 5) + neobytesd.walletpassphrase(passphrase, 5) except: sys.stderr.write("Wrong passphrase\n") - info = dashd.getinfo() + info = neobytesd.getinfo() return int(info['unlocked_until']) > time.time() -def list_available(dashd): +def list_available(neobytesd): address_summary = dict() address_to_account = dict() - for info in dashd.listreceivedbyaddress(0): + for info in neobytesd.listreceivedbyaddress(0): address_to_account[info["address"]] = info["account"] - unspent = dashd.listunspent(0) + unspent = neobytesd.listunspent(0) for output in unspent: # listunspent doesn't give addresses, so: - rawtx = dashd.getrawtransaction(output['txid'], 1) + rawtx = neobytesd.getrawtransaction(output['txid'], 1) vout = rawtx["vout"][output['vout']] pk = vout["scriptPubKey"] - # This code only deals with ordinary pay-to-dash-address + # This code only deals with ordinary pay-to-neobytes-address # or pay-to-script-hash outputs right now; anything exotic is ignored. if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash": continue @@ -139,8 +139,8 @@ def select_coins(needed, inputs): n += 1 return (outputs, have-needed) -def create_tx(dashd, fromaddresses, toaddress, amount, fee): - all_coins = list_available(dashd) +def create_tx(neobytesd, fromaddresses, toaddress, amount, fee): + all_coins = list_available(neobytesd) total_available = Decimal("0.0") needed = amount+fee @@ -159,7 +159,7 @@ def create_tx(dashd, fromaddresses, toaddress, amount, fee): # Note: # Python's json/jsonrpc modules have inconsistent support for Decimal numbers. # Instead of wrestling with getting json.dumps() (used by jsonrpc) to encode - # Decimals, I'm casting amounts to float before sending them to dashd. + # Decimals, I'm casting amounts to float before sending them to neobytesd. # outputs = { toaddress : float(amount) } (inputs, change_amount) = select_coins(needed, potential_inputs) @@ -170,8 +170,8 @@ def create_tx(dashd, fromaddresses, toaddress, amount, fee): else: outputs[change_address] = float(change_amount) - rawtx = dashd.createrawtransaction(inputs, outputs) - signed_rawtx = dashd.signrawtransaction(rawtx) + rawtx = neobytesd.createrawtransaction(inputs, outputs) + signed_rawtx = neobytesd.signrawtransaction(rawtx) if not signed_rawtx["complete"]: sys.stderr.write("signrawtransaction failed\n") sys.exit(1) @@ -179,10 +179,10 @@ def create_tx(dashd, fromaddresses, toaddress, amount, fee): return txdata -def compute_amount_in(dashd, txinfo): +def compute_amount_in(neobytesd, txinfo): result = Decimal("0.0") for vin in txinfo['vin']: - in_info = dashd.getrawtransaction(vin['txid'], 1) + in_info = neobytesd.getrawtransaction(vin['txid'], 1) vout = in_info['vout'][vin['vout']] result = result + vout['value'] return result @@ -193,12 +193,12 @@ def compute_amount_out(txinfo): result = result + vout['value'] return result -def sanity_test_fee(dashd, txdata_hex, max_fee): +def sanity_test_fee(neobytesd, txdata_hex, max_fee): class FeeError(RuntimeError): pass try: - txinfo = dashd.decoderawtransaction(txdata_hex) - total_in = compute_amount_in(dashd, txinfo) + txinfo = neobytesd.decoderawtransaction(txdata_hex) + total_in = compute_amount_in(neobytesd, txinfo) total_out = compute_amount_out(txinfo) if total_in-total_out > max_fee: raise FeeError("Rejecting transaction, unreasonable fee of "+str(total_in-total_out)) @@ -221,15 +221,15 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get dashs from") + help="addresses to get neobytes from") parser.add_option("--to", dest="to", default=None, - help="address to get send dashs to") + help="address to get send neobytes to") parser.add_option("--amount", dest="amount", default=None, help="amount to send") parser.add_option("--fee", dest="fee", default="0.0", help="fee to include") parser.add_option("--datadir", dest="datadir", default=determine_db_dir(), - help="location of dash.conf file with RPC username/password (default: %default)") + help="location of neobytes.conf file with RPC username/password (default: %default)") parser.add_option("--testnet", dest="testnet", default=False, action="store_true", help="Use the test network") parser.add_option("--dry_run", dest="dry_run", default=False, action="store_true", @@ -240,10 +240,10 @@ def main(): check_json_precision() config = read_bitcoin_config(options.datadir) if options.testnet: config['testnet'] = True - dashd = connect_JSON(config) + neobytesd = connect_JSON(config) if options.amount is None: - address_summary = list_available(dashd) + address_summary = list_available(neobytesd) for address,info in address_summary.iteritems(): n_transactions = len(info['outputs']) if n_transactions > 1: @@ -253,14 +253,14 @@ def main(): else: fee = Decimal(options.fee) amount = Decimal(options.amount) - while unlock_wallet(dashd) == False: + while unlock_wallet(neobytesd) == False: pass # Keep asking for passphrase until they get it right - txdata = create_tx(dashd, options.fromaddresses.split(","), options.to, amount, fee) - sanity_test_fee(dashd, txdata, amount*Decimal("0.01")) + txdata = create_tx(neobytesd, options.fromaddresses.split(","), options.to, amount, fee) + sanity_test_fee(neobytesd, txdata, amount*Decimal("0.01")) if options.dry_run: print(txdata) else: - txid = dashd.sendrawtransaction(txdata) + txid = neobytesd.sendrawtransaction(txdata) print(txid) if __name__ == '__main__': diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index 30a19bc43..3bbcc3729 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -1,6 +1,6 @@ ### TestGen ### -Utilities to generate test vectors for the data-driven Dash tests. +Utilities to generate test vectors for the data-driven NeoBytes tests. Usage: diff --git a/contrib/tidy_datadir.sh b/contrib/tidy_datadir.sh index d1b2d13fd..b6fa966e2 100755 --- a/contrib/tidy_datadir.sh +++ b/contrib/tidy_datadir.sh @@ -4,7 +4,7 @@ if [ -d "$1" ]; then cd "$1" else echo "Usage: $0 " >&2 - echo "Removes obsolete Dash database files" >&2 + echo "Removes obsolete NeoBytes database files" >&2 exit 1 fi @@ -16,22 +16,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 Dash datadir detected." + echo "Error: no NeoBytes datadir detected." exit 1 ;; 1) - echo "Detected old Dash datadir (before 0.7)." + echo "Detected old NeoBytes datadir (before 0.7)." echo "Nothing to do." exit 0 ;; 2) - echo "Detected Dash 0.7 datadir." + echo "Detected NeoBytes 0.7 datadir." ;; 3) - echo "Detected Dash pre-0.8 datadir." + echo "Detected NeoBytes pre-0.8 datadir." ;; 4) - echo "Detected Dash 0.8 datadir." + echo "Detected NeoBytes 0.8 datadir." ;; esac diff --git a/contrib/verify-commits/pre-push-hook.sh b/contrib/verify-commits/pre-push-hook.sh index be65ad24f..a3bc05fb3 100755 --- a/contrib/verify-commits/pre-push-hook.sh +++ b/contrib/verify-commits/pre-push-hook.sh @@ -1,5 +1,5 @@ #!/bin/bash -if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)dashpay/dash(.git)?$ ]]; then +if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)neobytes-project/neobytes(.git)?$ ]]; then exit 0 fi diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py index 62c3d34fb..c127ec246 100755 --- a/contrib/zmq/zmq_sub.py +++ b/contrib/zmq/zmq_sub.py @@ -5,7 +5,7 @@ import binascii import zmq import struct -port = 28332 +port = 21426 zmqContext = zmq.Context() zmqSubSocket = zmqContext.socket(zmq.SUB) diff --git a/depends/README.md b/depends/README.md index 66afecb5c..8686d0e11 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 Dash's +A prefix will be generated that's suitable for plugging into NeoBytes's configure. In the above example, a dir named x86_64-w64-mingw32 will be -created. To use it for Dash: +created. To use it for NeoBytes: ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32 @@ -40,7 +40,7 @@ The following can be set when running make: make FOO=bar DEBUG: disable some optimizations and enable more runtime checking If some packages are not built, for example `make NO_WALLET=1`, the appropriate -options will be passed to Dash Core's configure. In this case, `--disable-wallet`. +options will be passed to NeoBytes Core's configure. In this case, `--disable-wallet`. Additional targets: diff --git a/doc/Doxyfile b/doc/Doxyfile index 33aeffde6..1a107d3b5 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "Dash Core" +PROJECT_NAME = "NeoBytes 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 diff --git a/doc/README.md b/doc/README.md index 821fa9ab9..f778248e1 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,11 +1,11 @@ -Dash Core 0.12.1 +NeoBytes Core 0.12.1 ===================== -This is the official reference wallet for Dash digital currency and comprises the backbone of the Dash peer-to-peer network. You can [download Dash Core](https://www.dash.org/downloads/) or [build it yourself](#building) using the guides below. +This is the official reference wallet for NeoBytes digital currency and comprises the backbone of the NeoBytes peer-to-peer network. You can [download NeoBytes Core](https://www.neobytes.org/downloads/) or [build it yourself](#building) using the guides below. Running --------------------- -The following are some helpful notes on how to run Dash on your native platform. +The following are some helpful notes on how to run NeoBytes on your native platform. ### Unix @@ -16,22 +16,22 @@ Unpack the files into a directory and run: ### Windows -Unpack the files into a directory, and then run dash-qt.exe. +Unpack the files into a directory, and then run neobytes-qt.exe. ### OS X -Drag Dash-Qt to your applications folder, and then run Dash-Qt. +Drag NeoBytes-Qt to your applications folder, and then run NeoBytes-Qt. ### Need Help? -* See the [Dash documentation](https://dashpay.atlassian.net/wiki/display/DOC) +* See the [NeoBytes documentation](https://neobytes.atlassian.net/wiki/display/DOC) for help and more information. -* Ask for help on [#dashpay](http://webchat.freenode.net?channels=dashpay) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=dashpay). -* Ask for help on the [DashTalk](https://dashtalk.org/) forums. +* Ask for help on [#neobytes](http://webchat.freenode.net?channels=neobytes) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=neobytes). +* Ask for help on the [NeoBytesTalk](https://neobytestalk.org/) forums. Building --------------------- -The following are developer notes on how to build Dash Core 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 NeoBytes Core 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) @@ -41,7 +41,7 @@ The following are developer notes on how to build Dash Core on your native platf Development --------------------- -The Dash Core repo's [root README](/README.md) contains relevant information on the development process and automated testing. +The NeoBytes Core repo's [root README](/README.md) contains relevant information on the development process and automated testing. - [Developer Notes](developer-notes.md) - [Multiwallet Qt Development](multiwallet-qt.md) @@ -57,8 +57,8 @@ The Dash Core repo's [root README](/README.md) contains relevant information on - [Dnsseed Policy](dnsseed-policy.md) ### Resources -* Discuss on the [DashTalk](https://dashtalk.org/) forums, in the Development & Technical Discussion board. -* Discuss on [#dashpay](http://webchat.freenode.net/?channels=dashpay) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=dashpay). +* Discuss on the [NeoBytesTalk](https://neobytestalk.org/) forums, in the Development & Technical Discussion board. +* Discuss on [#neobytes](http://webchat.freenode.net/?channels=neobytes) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=neobytes). ### Miscellaneous - [Assets Attribution](assets-attribution.md) diff --git a/doc/README_windows.txt b/doc/README_windows.txt index 1a347d4be..eec190d30 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,9 +1,9 @@ -Dash Core 0.12.1 +NeoBytes Core 0.12.1 ===================== Intro ----- -Dash is a free open source peer-to-peer electronic cash system that is +NeoBytes 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 dash-qt.exe. +Unpack the files into a directory and run neobytes-qt.exe. -Dash Core is the original Dash client and it builds the backbone of the network. -However, it downloads and stores the entire history of Dash transactions; +NeoBytes Core is the original NeoBytes client and it builds the backbone of the network. +However, it downloads and stores the entire history of NeoBytes 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 dash wiki at: - https://dashpay.atlassian.net/wiki/ +See the neobytes wiki at: + https://github.com/neobytes-project/neobytes/wiki for more help and information. diff --git a/doc/REST-interface.md b/doc/REST-interface.md index bf669235e..7285a7db9 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -53,7 +53,7 @@ https://github.com/bitcoin/bips/blob/master/bip-0064.mediawiki Example: ``` -$ curl localhost:18332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp +$ curl localhost:12426/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp { "chaintipHash" : "00000000fb01a7f3745a717f8caebee056c484e6e0bfe4a9591c235bb70506fb", "chainHeight" : 325347, @@ -93,4 +93,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 `