merged in renaming changes to v2.1.3.4

COPYING

@@ -1,6 +1,6 @@
 Copyright (c) 2009-2015 Bitcoin Developers
 Copyright (c) 2014-2015 Dash Developers
-Copyright (c) 2015-2016 DarkNet Developers
+Copyright (c) 2015-2017 PIVX 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

INSTALL

@@ -1,4 +1,4 @@
-Building DarkNet
+Building PIVX
 
 Use the autogen script to prepare the build environment.
 
@@ -8,6 +8,6 @@ Use the autogen script to prepare the build environment.
 
 Always verify the signatures and checksums.
 
-See doc/build-*.md for instructions on building darknetd,
+See doc/build-*.md for instructions on building pivxd,
 the intended-for-services, no-graphical-interface, reference
-implementation of DarkNet.
+implementation of PIVX.

Makefile.am

@@ -4,12 +4,12 @@ SUBDIRS = src
 
 GZIP_ENV="-9n"
 
-BITCOIND_BIN=$(top_builddir)/src/darknetd$(EXEEXT)
-BITCOIN_QT_BIN=$(top_builddir)/src/qt/darknet-qt$(EXEEXT)
-BITCOIN_CLI_BIN=$(top_builddir)/src/darknet-cli$(EXEEXT)
+BITCOIND_BIN=$(top_builddir)/src/pivxd$(EXEEXT)
+BITCOIN_QT_BIN=$(top_builddir)/src/qt/pivx-qt$(EXEEXT)
+BITCOIN_CLI_BIN=$(top_builddir)/src/pivx-cli$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
 
-OSX_APP=DarkNet-Qt.app
+OSX_APP=PIVX-Qt.app
 OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
 OSX_DMG = $(OSX_VOLNAME).dmg
 OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
@@ -32,9 +32,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_darknet_filtered.info total_coverage.info \
+  leveldb_baseline.info test_pivx_filtered.info total_coverage.info \
   baseline_filtered.info block_test_filtered.info \
-  leveldb_baseline_filtered.info test_darknet_coverage.info test_darknet.info
+  leveldb_baseline_filtered.info test_pivx_coverage.info test_pivx.info
 
 dist-hook:
 	-$(MAKE) -C $(top_distdir)/src/leveldb clean
@@ -76,13 +76,13 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
 	$(MKDIR_P) $(@D)
 	$(INSTALL_DATA) $< $@
 
-$(OSX_APP)/Contents/MacOS/DarkNet-Qt: $(BITCOIN_QT_BIN)
+$(OSX_APP)/Contents/MacOS/PIVX-Qt: $(BITCOIN_QT_BIN)
 	$(MKDIR_P) $(@D)
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $< $@
 
 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/DarkNet-Qt
+  $(OSX_APP)/Contents/MacOS/PIVX-Qt
 
 osx_volname:
 	echo $(OSX_VOLNAME) >$@
@@ -100,18 +100,18 @@ $(APP_DIST_DIR)/Applications:
 	@rm -f $@
 	@cd $(@D); $(LN_S) /Applications $(@F)
 
-$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/DarkNet-Qt
+$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/PIVX-Qt
 
 $(OSX_DMG): $(APP_DIST_EXTRAS)
-	$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Darknet-Qt" -no-pad -r -dir-mode 0755 -apple -o $@ dist
+	$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Pivx-Qt" -no-pad -r -dir-mode 0755 -apple -o $@ dist
 
 $(APP_DIST_DIR)/.background/background.png:
 	$(MKDIR_P) $(@D)
 	$(INSTALL) $(top_srcdir)/contrib/macdeploy/background.png $@
 $(APP_DIST_DIR)/.DS_Store:
 	$(INSTALL) $(top_srcdir)/contrib/macdeploy/DS_Store $@
 
-$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/DarkNet-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
+$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/PIVX-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)
@@ -151,16 +151,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_darknet.info: baseline_filtered_combined.info
+test_pivx.info: baseline_filtered_combined.info
 	$(MAKE) -C src/ check
-	$(LCOV) -c -d $(abs_builddir)/src -t test_darknet -o $@
+	$(LCOV) -c -d $(abs_builddir)/src -t test_pivx -o $@
 	$(LCOV) -z -d $(abs_builddir)/src
 	$(LCOV) -z -d $(abs_builddir)/src/leveldb
 
-test_darknet_filtered.info: test_darknet.info
+test_pivx_filtered.info: test_pivx.info
 	$(LCOV) -r $< "/usr/include/*" -o $@
 
-block_test.info: test_darknet_filtered.info
+block_test.info: test_pivx_filtered.info
 	$(MKDIR_P) qa/tmp
 	-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
 	$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
@@ -170,21 +170,21 @@ block_test.info: test_darknet_filtered.info
 block_test_filtered.info: block_test.info
 	$(LCOV) -r $< "/usr/include/*" -o $@
 
-test_darknet_coverage.info: baseline_filtered_combined.info test_darknet_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_darknet_filtered.info -o $@
+test_pivx_coverage.info: baseline_filtered_combined.info test_pivx_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_pivx_filtered.info -o $@
 
-total_coverage.info:  baseline_filtered_combined.info test_darknet_filtered.info block_test_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_darknet_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
+total_coverage.info:  baseline_filtered_combined.info test_pivx_filtered.info block_test_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_pivx_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 
-test_darknet.coverage/.dirstamp:  test_darknet_coverage.info
+test_pivx.coverage/.dirstamp:  test_pivx_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
 total.coverage/.dirstamp: total_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
-cov: test_darknet.coverage/.dirstamp total.coverage/.dirstamp
+cov: test_pivx.coverage/.dirstamp total.coverage/.dirstamp
 
 endif
 
@@ -201,4 +201,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
 .INTERMEDIATE: $(COVERAGE_INFO)
 
 clean-local:
-	rm -rf test_darknet.coverage/ total.coverage/ $(OSX_APP)
+	rm -rf test_pivx.coverage/ total.coverage/ $(OSX_APP)

README.md

@@ -1,74 +1,74 @@
-DarkNet Repository (Version 2.1.3.4)
-More information at darknet-crypto.com
+PIVX Repository (Version 2.1.3.4)
+More information at pivx.org
 Visit our ANN thread at bitcointalk.org/index.php?topic=1262920
 
 Coin specs:
 
 Algo:  Quark
-PoW Block Reward:  (block# 2 - 151200) 250 PIVX (block# 151201 - 259200) 50 PIVX
+PoW Block Reward:  (block# 2 - 151200) 250 PIV (block# 151201 - 259200) 50 PIV
 Block Time:  60 Second with Retargeting at every Block
 
 Coin Supply During PoW Phase:  43,199,500
 
 
 
 PoW Phase:  (block# 1) 60k Premine for the Creation of 6 Masternodes for the Functioning of the Network
-            (60k PIVX will be Burned at approx. Block 259201)
+            (60k PIV will be Burned at approx. Block 259201)
 PoW Phase:  (block#’s 2-259200) Approx. 180 DAYS
 
 
 
-PoW Rewards Breakdown:  (block#’s 2-43200) 20% MNODE (50 PIVX) / 80% MINER (200 PIVX)
-                        (block#’s 43201-172800) 20% MNODE (50 PIVX) / 70% MINER (175 PIVX) / 10% available to the PROPOSALS (25 PIVX)
-                        (block#’s 172800-259200) 45% MNODE (22.5 PIVX) / 45% MINER (22.5 PIVX) / 10% available to the PROPOSALS (10 PIVX)
+PoW Rewards Breakdown:  (block#’s 2-43200) 20% MNODE (50 PIV) / 80% MINER (200 PIV)
+                        (block#’s 43201-172800) 20% MNODE (50 PIV) / 70% MINER (175 PIV) / 10% available to the PROPOSALS (25 PIV)
+                        (block#’s 172800-259200) 45% MNODE (22.5 PIV) / 45% MINER (22.5 PIV) / 10% available to the PROPOSALS (10 PIV)
 
 
 
 PoS Phase 1:  PoS [259201-302399] 30 DAYS
-PoS Rewards Breakdown:  50 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  50 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase 2: PoS [302400-345599] 30 DAYS
-PoS Rewards Breakdown:  45 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  45 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase 3: PoS [345600-388799] 30 DAYS
-PoS Rewards Breakdown:  40 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  40 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase 4: PoS [388800-431999] 30 DAYS
-PoS Rewards Breakdown:  35 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  35 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase 5: PoS [432000-475199] 30 DAYS
-PoS Rewards Breakdown:  30 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  30 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase 6: PoS [475200-518399] 30 DAYS
-PoS Rewards Breakdown:  25 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  25 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase 7: PoS [518400-561599] 30 DAYS
-PoS Rewards Breakdown:  20 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  20 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase 8: PoS [561600-604799] 30 DAYS
-PoS Rewards Breakdown:  15 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  15 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase 9: PoS [604800-647999] 30 DAYS
-PoS Rewards Breakdown:  10 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  10 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                  masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 
 PoS Phase X: PoS [648000-forever] 
-PoS Rewards Breakdown:  5 PIVX (90% distributed between the MN/Staker based upon the amount of coins held in the                                   masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
+PoS Rewards Breakdown:  5 PIV (90% distributed between the MN/Staker based upon the amount of coins held in the                                   masternodes to how many coins are being staked / up to 10% of the block is available to the                                proposal system)
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-DarkNet is a cutting edge crytpocurrency, with many features not available in most other cryptocurrencies. 
+PIVX is a cutting edge cryptocurrency, with many features not available in most other cryptocurrencies. 
 Anonymized transactions using coin mixing technology, we call it Obfuscation.
 
 Fast transactions featuring guaranteed zero confirmation transactions, we call it SwiftTX.
 
 Decentralized blockchain voting providing for consensus based advancement of the currency
-Masternode technology used to secure the network and provide the above features, each masternode is secured with collateral of 10kPIVX
+Masternode technology used to secure the network and provide the above features, each masternode is secured with collateral of 10K PIV

build-aux/m4/bitcoin_qt.m4

@@ -3,7 +3,7 @@ dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
 AC_DEFUN([BITCOIN_QT_FAIL],[
   if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then
     if test x$bitcoin_enable_qt != xno; then
-      AC_MSG_WARN([$1; darknet-qt frontend will not be built])
+      AC_MSG_WARN([$1; pivx-qt frontend will not be built])
     fi
     bitcoin_enable_qt=no
     bitcoin_enable_qt_test=no
@@ -50,7 +50,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[
   dnl enable qt support
   AC_ARG_WITH([gui],
     [AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
-    [build darknet-qt GUI (default=auto, qt5 tried first)])],
+    [build pivx-qt GUI (default=auto, qt5 tried first)])],
     [
      bitcoin_qt_want_version=$withval
      if test x$bitcoin_qt_want_version = xyes; then

configure.ac

@@ -6,17 +6,17 @@ define(_CLIENT_VERSION_REVISION, 3)
 define(_CLIENT_VERSION_BUILD, 4)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2016)
-AC_INIT([Darknet Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.darknet-crypto.com],[darknet])
+AC_INIT([Pivx Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.pivx.org],[pivx])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/pivx-config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
 
 AC_CANONICAL_HOST
 
-AH_TOP([#ifndef PIVX_CONFIG_H])
-AH_TOP([#define PIVX_CONFIG_H])
-AH_BOTTOM([#endif //PIVX_CONFIG_H])
+AH_TOP([#ifndef PIV_CONFIG_H])
+AH_TOP([#define PIV_CONFIG_H])
+AH_BOTTOM([#endif //PIV_CONFIG_H])
 
 dnl faketime breaks configure and is only needed for make. Disable it here.
 unset FAKETIME
@@ -176,7 +176,7 @@ CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_
 
 AC_ARG_WITH([utils],
   [AS_HELP_STRING([--with-utils],
-  [build darknet-cli darknet-tx (default=yes)])],
+  [build pivx-cli pivx-tx (default=yes)])],
   [build_bitcoin_utils=$withval],
   [build_bitcoin_utils=yes])
 
@@ -188,7 +188,7 @@ AC_ARG_WITH([libs],
 
 AC_ARG_WITH([daemon],
   [AS_HELP_STRING([--with-daemon],
-  [build darknetd daemon (default=yes)])],
+  [build pivxd daemon (default=yes)])],
   [build_bitcoind=$withval],
   [build_bitcoind=yes])
 
@@ -722,11 +722,11 @@ LIBS="$LIBS_TEMP"
 
 BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
 
-AC_MSG_CHECKING([whether to build darknetd])
+AC_MSG_CHECKING([whether to build pivxd])
 AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
 AC_MSG_RESULT($build_bitcoind)
 
-AC_MSG_CHECKING([whether to build utils (darknet-cli darknet-tx)])
+AC_MSG_CHECKING([whether to build utils (pivx-cli pivx-tx)])
 AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
 AC_MSG_RESULT($build_bitcoin_utils)
 
@@ -826,7 +826,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_darknet-qt])
+  AC_MSG_CHECKING([whether to build test_pivx-qt])
   if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
     AC_MSG_RESULT([yes])
     BUILD_TEST_QT="test"
@@ -835,7 +835,7 @@ if test x$bitcoin_enable_qt != xno; then
   fi
 fi
 
-AC_MSG_CHECKING([whether to build test_darknet])
+AC_MSG_CHECKING([whether to build test_pivx])
 if test x$use_tests = xyes; then
   AC_MSG_RESULT([yes])
   BUILD_TEST="test"

contrib/debian/README.md

@@ -1,21 +1,21 @@
 
 Debian
 ====================
-This directory contains files used to package darknetd/darknet-qt
-for Debian-based Linux systems. If you compile darknetd/darknet-qt yourself, there are some useful files here.
+This directory contains files used to package pivxd/pivx-qt
+for Debian-based Linux systems. If you compile pivxd/pivx-qt yourself, there are some useful files here.
 
-## darknet: URI support ##
+## pivx: URI support ##
 
 
-darknet-qt.desktop  (Gnome / Open Desktop)
+pivx-qt.desktop  (Gnome / Open Desktop)
 To install:
 
-	sudo desktop-file-install darknet-qt.desktop
+	sudo desktop-file-install pivx-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 darknet-qt binary to `/usr/bin`
-and the `../../share/pixmaps/darknet128.png` to `/usr/share/pixmaps`
+the .desktop file or copy or symlink your pivxqt binary to `/usr/bin`
+and the `../../share/pixmaps/pivx128.png` to `/usr/share/pixmaps`
 
-darknet-qt.protocol (KDE)
+pivx-qt.protocol (KDE)
 

contrib/debian/changelog

@@ -365,8 +365,8 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low
 bitcoin (0.3.19~dfsg-4) unstable; urgency=low
 
   [ Micah Anderson ]
-  * Provide example darknet.conf.
-  * Add bitcoind(1) and darknet.conf(5) man pages.
+  * Provide example pivx.conf.
+  * Add bitcoind(1) and pivx.conf(5) man pages.
 
   [ Jonas Smedegaard ]
   * Ease backporting: