Merge branch 'master_candidate'

Author: giaki3003

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
 define(_CLIENT_VERSION_MINOR, 3)
-define(_CLIENT_VERSION_REVISION, 3)
+define(_CLIENT_VERSION_REVISION, 5)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

depends/install-dependencies.sh

@@ -3,36 +3,60 @@
 date
 
 #################################################################
-# Update Ubuntu and install prerequisites for running LUX   #
+# Update Ubuntu before we start  #
 #################################################################
-sudo add-apt-repository ppa:bitcoin/bitcoin
 sudo apt-get update
 
 #################################################################
-# Lux QT wallet are using QT5. So, QT4 must be removed
+# Lux QT wallet are using QT5. So, QT4 must be removed #
 #################################################################
 sudo apt purge qt4-qmake libqt4-dev -y
 
 #################################################################
-# Remove incompatible libdb
+# Remove incompatible libdb #
 #################################################################
 sudo apt purge libdb++-dev libdb-dev -y
 
 #################################################################
-# Remove unused package
+# Remove unused package #
 #################################################################
 sudo apt autoremove -y
 
 #################################################################
-# Build LUX from source                                     #
+# Build LUX from source #
 #################################################################
 NPROC=$(nproc)
 echo "nproc: $NPROC"
 
 set -e
 
 #################################################################
-# Install all necessary packages for building LUX         #
+# Install all necessary packages for building LUX #
 #################################################################
-sudo apt-get install -y libdb4.8-dev libdb4.8++-dev libzmq3-dev libminiupnpc-dev libcrypto++-dev libboost-all-dev build-essential libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev libssl-dev ufw git software-properties-common libtool autotools-dev autoconf pkg-config libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev automake g++-mingw-w64-x86-64 libevent-dev bsdmainutils curl git g++-mingw-w64-i686 mingw-w64-i686-dev g++-mingw-w64-x86-64
+sudo apt-get install -y libzmq3-dev libminiupnpc-dev libcrypto++-dev libboost-all-dev build-essential libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev libssl-dev ufw git software-properties-common libtool autotools-dev autoconf pkg-config libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev automake g++-mingw-w64-x86-64 libevent-dev bsdmainutils curl git g++-mingw-w64-i686 mingw-w64-i686-dev
 
+#################################################################
+# Grab bdb #
+#################################################################
+
+wget http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz
+
+#################################################################
+# Extract and install it #
+#################################################################
+
+tar -xvf db-4.8.30.NC.tar.gz
+cd db-4.8.30.NC
+wget http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+patch -p2 < 0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+cd build_unix
+mkdir -p build
+BDB_PREFIX=$(pwd)/build
+../dist/configure --prefix=/usr/local --disable-shared --enable-cxx --with-pic
+sudo make install
+
+cd ../..
+
+rm -rf db-4.8.30.NC
+
+rm -rf db-4.8.30.NC.tar.gz

src/Makefile.qt.include

@@ -102,6 +102,7 @@ QT_MOC_CPP = \
   qt/moc_contractbookpage.cpp \
   qt/moc_contractresult.cpp \
   qt/moc_contracttablemodel.cpp \
+  qt/moc_converter.cpp \
   qt/moc_createcontract.cpp \
   qt/moc_csvmodelwriter.cpp \
   qt/moc_darksendconfig.cpp \
@@ -225,12 +226,14 @@ BITCOIN_QT_H = \
   qt/contractbookpage.h \
   qt/contractresult.h \
   qt/contracttablemodel.h \
+  qt/converter.h \
   qt/createcontract.h \
   qt/csvmodelwriter.h \
   qt/customlist.h \
   qt/darksendconfig.h \
   qt/editaddressdialog.h \
   qt/editcontractinfodialog.h \
+  qt/ethaddresslineedit.h \
   qt/execrpccommand.h \
   qt/eventlog.h \
   qt/guiconstants.h \
@@ -312,66 +315,89 @@ endif
 
 RES_ICONS = \
   qt/res/icons/add.png \
+  qt/res/icons/add-white.png \
   qt/res/icons/address-book.png \
+  qt/res/icons/address-book-white.png \
   qt/res/icons/auto_backup.png \
   qt/res/icons/backup.png \
+  qt/res/icons/backup-white.png \
   qt/res/icons/bitcoin.ico \
   qt/res/icons/bitcoin.png \
   qt/res/icons/bitcoin_testnet.ico \
   qt/res/icons/bitcoin_testnet.png \
   qt/res/icons/browse.png \
+  qt/res/icons/browse-light.png \
   qt/res/icons/chevron.png \
+  qt/res/icons/chevron-white.png \
   qt/res/icons/clock1.png \
   qt/res/icons/clock2.png \
   qt/res/icons/clock3.png \
   qt/res/icons/clock4.png \
   qt/res/icons/clock5.png \
   qt/res/icons/conf.png \
+  qt/res/icons/conf-white.png \
   qt/res/icons/configure.png \
   qt/res/icons/connect0_16.png \
   qt/res/icons/connect1_16.png \
   qt/res/icons/connect2_16.png \
   qt/res/icons/connect3_16.png \
   qt/res/icons/connect4_16.png \
   qt/res/icons/debugwindow.png \
+  qt/res/icons/debugwindow-white.png \
   qt/res/icons/discord.png \
   qt/res/icons/edit.png \
   qt/res/icons/editcopy.png \
   qt/res/icons/editpaste.png \
+  qt/res/icons/editpaste-white.png \
   qt/res/icons/explorer.png \
   qt/res/icons/export.png \
   qt/res/icons/eye.png \
   qt/res/icons/eye_minus.png \
   qt/res/icons/eye_plus.png \
   qt/res/icons/filesave.png \
+  qt/res/icons/filesave-light.png \
   qt/res/icons/fontbigger.png \
+  qt/res/icons/fontbigger-white.png \
   qt/res/icons/fontsmaller.png \
+  qt/res/icons/fontsmaller-white.png \
   qt/res/icons/github.png \
   qt/res/icons/hd_disabled.png \
   qt/res/icons/hd_enabled.png \
   qt/res/icons/hex.png \
+  qt/res/icons/hex-white.png \
   qt/res/icons/history.png \
   qt/res/icons/home.png \
   qt/res/icons/hub.png \
   qt/res/icons/key.png \
+  qt/res/icons/key-white.png \
   qt/res/icons/lock_closed.png \
   qt/res/icons/lock_closed_black.png \
+  qt/res/icons/lock_closed_black-white.png \
   qt/res/icons/luxcoin_black.png \
+  qt/res/icons/luxcoin_black-white.png \
   qt/res/icons/lsrtoken.png \
   qt/res/icons/lock_open.png \
+  qt/res/icons/lock_open-white.png \
   qt/res/icons/luxupdate-loader.gif \
   qt/res/icons/masternodes.png \
   qt/res/icons/network_monitor.png \
+  qt/res/icons/network_monitor-white.png \
   qt/res/icons/options.png \
+  qt/res/icons/options-white.png \
   qt/res/icons/overview.png \
   qt/res/icons/peer.png \
+  qt/res/icons/peer-white.png \
   qt/res/icons/qrcode.png \
   qt/res/icons/quit.png \
+  qt/res/icons/quit-light.png \
   qt/res/icons/receive.png \
   qt/res/icons/remove.png \
+  qt/res/icons/remove-light.png \
   qt/res/icons/restore.png \
+  qt/res/icons/restore-white.png \
   qt/res/icons/send.png \
   qt/res/icons/sign.png \
+  qt/res/icons/sign-white.png \
   qt/res/icons/smartcontract.png \
   qt/res/icons/staking_active.png \
   qt/res/icons/staking_inactive.png \
@@ -383,8 +409,11 @@ RES_ICONS = \
   qt/res/icons/transaction_abandoned.png \
   qt/res/icons/transaction_conflicted.png \
   qt/res/icons/tx_inout.png \
+  qt/res/icons/tx_inout-light.png \
   qt/res/icons/tx_input.png \
+  qt/res/icons/tx_input-light.png \
   qt/res/icons/tx_output.png \
+  qt/res/icons/tx_output-light.png \
   qt/res/icons/tx_mined.png \
   qt/res/icons/twitter.png \
   qt/res/icons/unit_lux.png \
@@ -396,8 +425,11 @@ RES_ICONS = \
   qt/res/icons/update.ico \
   qt/res/icons/update_black.png \
   qt/res/icons/verified.png \
+  qt/res/icons/verified-white.png \
   qt/res/icons/wallet_repair.png \
-  qt/res/icons/warning.png
+  qt/res/icons/wallet_repair-white.png \
+  qt/res/icons/warning.png \
+  qt/res/icons/warning-white.png
 
 
 BITCOIN_QT_CPP = \
@@ -462,10 +494,12 @@ BITCOIN_QT_CPP += \
   qt/contractbookpage.cpp \
   qt/contractresult.cpp \
   qt/contracttablemodel.cpp \
+  qt/converter.cpp \
   qt/createcontract.cpp \
   qt/darksendconfig.cpp \
   qt/editaddressdialog.cpp \
   qt/execrpccommand.cpp \
+  qt/ethaddresslineedit.cpp \
   qt/editcontractinfodialog.cpp \
   qt/eventlog.cpp \
   qt/masternodemanager.cpp \
@@ -528,9 +562,11 @@ endif
 
 RES_IMAGES = \
   qt/res/images/about.png \
+  qt/res/images/about-white.png \
   qt/res/images/splash.png \
   qt/res/images/splash_testnet.png \
   qt/res/images/lux_logo_horizontal.png \
+  qt/res/images/lux_logo_horizontal-white.png \
   qt/res/images/downArrow.png \
   qt/res/images/downArrow_small.png \
   qt/res/images/upArrow_small.png \
@@ -541,7 +577,9 @@ RES_IMAGES = \
   qt/res/images/walletFrame_bg.png
 
 RES_CSS = \
-  qt/res/css/default.css
+  qt/res/css/default.css \
+  qt/res/css/dark_blue.css \
+  qt/res/css/dark_grey.css
 
 RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
 

src/chainparams.cpp

@@ -320,11 +320,11 @@ class CTestNetParams : public CMainParams
 //        std::cout << genesis.GetHash().GetHex() << std::endl;
 //        std::cout << genesis.hashMerkleRoot.GetHex() << std::endl;
 
-        nSwitchPhi2Block = 1000;
-        nSplitRewardBlock = 1500;
-        nPruneAfterHeight = 5000;
-        nFirstSCBlock = 10000;
-        nPreminePaymentandHardForkBlock = 50000;
+        nSwitchPhi2Block = 30;
+        nSplitRewardBlock = 500000;
+        nPruneAfterHeight = 500000;
+        nFirstSCBlock = 40;
+        nPreminePaymentandHardForkBlock = 500000;
 
         consensus.hashGenesisBlock = genesis.GetHash();
 

src/compressor.h

@@ -91,9 +91,15 @@ class CScriptCompressor
             Decompress(nSize, vch);
             return;
         }
-        nSize -= nSpecialScripts;
-        script.resize(nSize);
-        s >> REF(CFlatData(script));
+        if (nSize > 500000) {
+            // Overly long script, replace with a short invalid one (OOMph)
+            script << OP_RETURN;
+            s.ignore(nSize);
+        } else {
+            nSize -= nSpecialScripts;
+            script.resize(nSize);
+            s >> REF(CFlatData(script));
+        }
     }
 };