Revised merged against current Energi stable

Author: andvgal

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,10 @@
 <!--- Remove sections that do not apply -->
 
-This issue tracker is only for technical issues related to Dash Core.
+This issue tracker is only for technical issues related to Energi Core.
 
-General Dash questions and/or support requests and are best directed to the [Dashpay Reddit](https://www.reddit.com/r/dashpay/).
+General Energi questions and/or support requests and are best directed through one of the [Community channels](https://www.energi.world/).
 
-To report critical security issues, email [email protected] instead of creating Github issues.
+To report critical security issues, email [email protected] instead of creating Github issues.
 
 ### Describe the issue
 

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[dash.qt-translation-012x]
-file_filter = src/qt/locale/dash_<lang>.ts
-source_file = src/qt/locale/dash_en.ts
+[energi.qt-translation-2x]
+file_filter = src/qt/locale/energi_<lang>.ts
+source_file = src/qt/locale/energi_en.ts
 source_lang = en

build-aux/m4/bitcoin_find_bdb48.m4

@@ -12,7 +12,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
     bdbpath=X
     bdb48path=X
     bdbdirlist=
-    for _vn in 4.8 48 4 5 ''; do
+    for _vn in 4.8 48 4 5 5.3 ''; do
       for _pfx in b lib ''; do
         bdbdirlist="$bdbdirlist ${_pfx}db${_vn}"
       done
@@ -64,7 +64,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
   
   if test "x$BDB_LIBS" = "x"; then
     # TODO: Ideally this could find the library version and make sure it matches the headers being used
-    for searchlib in db_cxx-4.8 db_cxx; do
+    for searchlib in db_cxx-4.8 db_cxx db4_cxx; do
       AC_CHECK_LIB([$searchlib],[main],[
         BDB_LIBS="-l${searchlib}"
         break

contrib/debian/examples/dash.conf

@@ -67,9 +67,30 @@
 # This option can be specified multiple times (default: bind to all interfaces)
 #rpcbind=<addr>
 
-# You must set rpcuser and rpcpassword to secure the JSON-RPC api
+# If no rpcpassword is set, rpc cookie auth is sought. The default `-rpccookiefile` name
+# is .cookie and found in the `-datadir` being used for bitcoind. This option is typically used
+# when the server and client are run as the same user.
+#
+# If not, you must set rpcuser and rpcpassword to secure the JSON-RPC api. The first
+# method(DEPRECATED) is to set this pair for the server and client:
 #rpcuser=Ulysseys
 #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
+#
+# The second method `rpcauth` can be added to server startup argument. It is set at intialization time
+# using the output from the script in share/rpcuser/rpcuser.py after providing a username:
+#
+# ./share/rpcuser/rpcuser.py alice
+# String to be appended to bitcoin.conf:
+# rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
+# Your password:
+# DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E=
+#
+# On client-side, you add the normal user/password pair to send commands:
+#rpcuser=alice
+#rpcpassword=DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E=
+#
+# You can even add multiple entries of these to the server conf file, and client can use any of them:
+# rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99
 
 # How many seconds Energi Core will wait for a complete RPC HTTP request.
 # after the HTTP connection is established. 

contrib/debian/examples/energi.conf

@@ -1,4 +1,4 @@
-.TH ENERGI-CLI "1" "June 2016" "energi-cli 0.12"
+.TH ENERGI-CLI "1" "December 2018" "energi-cli 2.0"
 .SH NAME
 energi-cli \- a remote procedure call client for Energi Core. 
 .SH SYNOPSIS

contrib/debian/manpages/energi-cli.1

@@ -1,4 +1,4 @@
-.TH ENERGI-QT "1" "June 2016" "energi-qt 0.12"
+.TH ENERGI-QT "1" "December 2018" "energi-qt 2.0"
 .SH NAME
 energi-qt \- peer-to-peer network based digital currency
 .SH DESCRIPTION

contrib/debian/manpages/energi-qt.1

@@ -1,4 +1,4 @@
-.TH ENERGI.CONF "5" "June 2016" "energi.conf 0.12"
+.TH ENERGI.CONF "5" "December 2018" "energi.conf 2.0"
 .SH NAME
 energi.conf \- Energi Core configuration file
 .SH SYNOPSIS

contrib/debian/manpages/energi.conf.5

@@ -1,4 +1,4 @@
-.TH ENERGID "1" "June 2016" "energid 0.12"
+.TH ENERGID "1" "December 2018" "energid 2.0"
 .SH NAME
 energid \- peer-to-peer network based digital currency
 .SH SYNOPSIS

contrib/debian/manpages/energid.1

@@ -9,6 +9,7 @@ FORMS += \
     ../src/qt/forms/helpmessagedialog.ui \
     ../src/qt/forms/intro.ui \
     ../src/qt/forms/masternodelist.ui \
+    ../src/qt/forms/qrdialog.ui \
     ../src/qt/forms/openuridialog.ui \
     ../src/qt/forms/optionsdialog.ui \
     ../src/qt/forms/overviewpage.ui \

contrib/energi-qt.pro

@@ -23,7 +23,7 @@
 #BITCOIND_NICE=0
 
 # Additional options (avoid -conf and -datadir, use flags above)
-BITCOIND_OPTS="-disablewallet"
+#BITCOIND_OPTS=""
 
 # The timeout in seconds OpenRC will wait for bitcoind to terminate
 # after a SIGTERM has been raised.

contrib/init/energid.openrcconf

@@ -4,11 +4,6 @@ $(package)_download_path=https://bitbucket.org/wooster/biplist/downloads
 $(package)_file_name=biplist-$($(package)_version).tar.gz
 $(package)_sha256_hash=4c0549764c5fe50b28042ec21aa2e14fe1a2224e239a1dae77d9e7f3932aa4c6
 $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
-$(package)_patches=sorted_list.patch
-
-define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/sorted_list.patch
-endef
 
 define $(package)_build_cmds
     python setup.py build

depends/packages/native_biplist.mk

@@ -4,11 +4,6 @@ $(package)_download_path=https://github.com/al45tair/mac_alias/archive/
 $(package)_file_name=v$($(package)_version).tar.gz
 $(package)_sha256_hash=6f606d3b6bccd2112aeabf1a063f5b5ece87005a5d7e97c8faca23b916e88838
 $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
-$(package)_patches=python3.patch
-
-define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/python3.patch
-endef
 
 define $(package)_build_cmds
     python3 setup.py build