Merge pull request #45 from DeckerSU/static-dev

0.7.2-beta3: static-dev -> static

Author: DeckerSU

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 7)
 define(_CLIENT_VERSION_REVISION, 2)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)
@@ -944,7 +944,7 @@ CXXFLAGS="${save_CXXFLAGS}"
 # platforms, so we use older autoconf detection mechanisms:
 if test x$TARGET_OS = xdarwin; then
 AC_CHECK_HEADER([gmp.h],,AC_MSG_ERROR(libgmp headers missing))
-AC_CHECK_LIB([gmp],[[__gmpn_sub_n]],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
+AC_CHECK_LIB([gmp],[__gmpn_sub_n],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
 
 AC_CHECK_HEADER([gmpxx.h],,AC_MSG_ERROR(libgmpxx headers missing))
 AC_CHECK_LIB([gmpxx],[main],GMPXX_LIBS=-lgmpxx, [AC_MSG_ERROR(libgmpxx missing)])

depends/packages/libgmp.mk

@@ -22,7 +22,7 @@ $(package)_download_path=https://ftp.gnu.org/gnu/gmp
 $(package)_file_name=gmp-$($(package)_version).tar.bz2
 $(package)_sha256_hash=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
 $(package)_dependencies=
-$(package)_config_opts=--enable-cxx --disable-shared
+$(package)_config_opts=--enable-cxx --disable-shared --with-pic
 endif
 
 define $(package)_config_cmds

depends/packages/qt.mk

@@ -1,6 +1,6 @@
 PACKAGE=qt
 $(package)_version=5.12.11
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/archive/qt/5.12/$($(package)_version)/submodules
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39

src/Makefile.am

@@ -293,8 +293,6 @@ libbitcoin_server_a_SOURCES = \
   cc/fsm.cpp \
   cc/heir.cpp \
   cc/oracles.cpp \
-  cc/prices.cpp \
-  cc/pegs.cpp \
   cc/payments.cpp \
   cc/gateways.cpp \
   cc/channels.cpp \
@@ -304,7 +302,6 @@ libbitcoin_server_a_SOURCES = \
   checkpoints.cpp \
   fs.cpp \
   crosschain.cpp \
-  crosschain_authority.cpp \
   deprecation.cpp \
   httprpc.cpp \
   httpserver.cpp \
@@ -465,11 +462,10 @@ libbitcoin_common_a_SOURCES = \
   komodo_events.cpp \
   komodo_gateway.cpp \
   komodo_globals.cpp \
+  komodo_hardfork.cpp \
   komodo_interest.cpp \
-  komodo_jumblr.cpp \
   komodo_kv.cpp \
   komodo_notary.cpp \
-  komodo_pax.cpp \
   komodo_utils.cpp \
   netbase.cpp \
   metrics.cpp \

src/Makefile.ktest.include

@@ -19,7 +19,9 @@ komodo_test_SOURCES = \
     test-komodo/test_netbase_tests.cpp \
     test-komodo/test_events.cpp \
     test-komodo/test_hex.cpp \
-    test-komodo/test_haraka_removal.cpp
+    test-komodo/test_haraka_removal.cpp \
+    test-komodo/test_oldhash_removal.cpp \
+    test-komodo/test_kmd_feat.cpp
 
 komodo_test_CPPFLAGS = $(komodod_CPPFLAGS)
 

src/Makefile.qt.include

@@ -179,7 +179,7 @@ KOMODO_MM = qt/macdockiconhandler.mm
 #  qt/macnotificationhandler.mm
 
 QT_MOC = \
-  qt/komodo.moc \
+  qt/komodoapp.moc \
   qt/komodoamountfield.moc \
   qt/callback.moc \
   qt/intro.moc \
@@ -438,7 +438,7 @@ qt_komodo_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(KOMODO_QT_INCLUDES)
   $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) 
 qt_komodo_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
-qt_komodo_qt_SOURCES = qt/komodo.cpp
+qt_komodo_qt_SOURCES = qt/komodoapp.cpp
 if TARGET_DARWIN
   qt_komodo_qt_SOURCES += $(KOMODO_MM)
 endif
@@ -526,7 +526,7 @@ $(srcdir)/qt/komodostrings.cpp: $(libkomodo_server_a_SOURCES) $(libkomodo_wallet
 	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
 	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
 
-translate: $(srcdir)/qt/komodostrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(KOMODO_QT_BASE_CPP) qt/komodo.cpp $(KOMODO_QT_WINDOWS_CPP) $(KOMODO_QT_WALLET_CPP) $(KOMODO_QT_H) $(KOMODO_MM)
+translate: $(srcdir)/qt/komodostrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(KOMODO_QT_BASE_CPP) qt/komodoapp.cpp $(KOMODO_QT_WINDOWS_CPP) $(KOMODO_QT_WALLET_CPP) $(KOMODO_QT_H) $(KOMODO_MM)
 	@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/komodo_en.ts
 

src/addrman.h

@@ -258,6 +258,33 @@ friend class CAddrManTest;
     //! Wraps GetRandInt to allow tests to override RandomInt and make it deterministic.
     virtual int RandomInt(int nMax);
 
+    /***
+     * @brief Clears the internal collections and fills them again
+     * @note the mutex should be held before this method is called
+     * @note the constructor calls this directly with no lock
+     */
+    void Clear_()
+    {
+        std::vector<int>().swap(vRandom);
+        nKey = GetRandHash();
+        for (size_t bucket = 0; bucket < ADDRMAN_NEW_BUCKET_COUNT; bucket++) {
+            for (size_t entry = 0; entry < ADDRMAN_BUCKET_SIZE; entry++) {
+                vvNew[bucket][entry] = -1;
+            }
+        }
+        for (size_t bucket = 0; bucket < ADDRMAN_TRIED_BUCKET_COUNT; bucket++) {
+            for (size_t entry = 0; entry < ADDRMAN_BUCKET_SIZE; entry++) {
+                vvTried[bucket][entry] = -1;
+            }
+        }
+
+        nIdCount = 0;
+        nTried = 0;
+        nNew = 0;
+        mapInfo.clear();
+        mapAddr.clear();
+    }
+
 #ifdef DEBUG_ADDRMAN
     //! Perform consistency check. Returns an error code or zero.
     int Check_();
@@ -502,29 +529,12 @@ friend class CAddrManTest;
     void Clear()
     {
         LOCK(cs);
-        std::vector<int>().swap(vRandom);
-        nKey = GetRandHash();
-        for (size_t bucket = 0; bucket < ADDRMAN_NEW_BUCKET_COUNT; bucket++) {
-            for (size_t entry = 0; entry < ADDRMAN_BUCKET_SIZE; entry++) {
-                vvNew[bucket][entry] = -1;
-            }
-        }
-        for (size_t bucket = 0; bucket < ADDRMAN_TRIED_BUCKET_COUNT; bucket++) {
-            for (size_t entry = 0; entry < ADDRMAN_BUCKET_SIZE; entry++) {
-                vvTried[bucket][entry] = -1;
-            }
-        }
-
-        nIdCount = 0;
-        nTried = 0;
-        nNew = 0;
-        mapInfo.clear();
-        mapAddr.clear();
+        Clear_();
     }
 
     CAddrMan()
     {
-        Clear();
+        Clear_();
     }
 
     ~CAddrMan()

src/alert.cpp

@@ -261,8 +261,7 @@ bool CAlert::ProcessAlert(const std::vector<unsigned char>& alertKey, bool fThre
     return true;
 }
 
-void
-CAlert::Notify(const std::string& strMessage, bool fThread)
+void CAlert::Notify(const std::string& strMessage, bool fThread)
 {
     std::string strCmd = GetArg("-alertnotify", "");
     if (strCmd.empty()) return;

src/alert.h

@@ -29,11 +29,6 @@
 #include <stdint.h>
 #include <string>
 
-class CAlert;
-class CNode;
-class uint256;
-
-extern std::map<uint256, CAlert> mapAlerts;
 extern CCriticalSection cs_mapAlerts;
 
 /** Alerts are for notifying old versions if they become too obsolete and
@@ -86,6 +81,9 @@ class CUnsignedAlert
     std::string ToString() const;
 };
 
+class CNode;
+class uint256;
+
 /** An alert is a combination of a serialized CUnsignedAlert and a signature. */
 class CAlert : public CUnsignedAlert
 {
@@ -124,4 +122,6 @@ class CAlert : public CUnsignedAlert
     static CAlert getAlertByHash(const uint256 &hash);
 };
 
+extern std::map<uint256, CAlert> mapAlerts;
+
 #endif // BITCOIN_ALERT_H

src/amount.h

@@ -21,28 +21,18 @@
 #ifndef BITCOIN_AMOUNT_H
 #define BITCOIN_AMOUNT_H
 
-#include "serialize.h"
 
+#include "serialize.h"
 #include <stdlib.h>
 #include <string>
+#include <cstdint>
 
 typedef int64_t CAmount;
 
 static const CAmount COIN = 100000000;
 static const CAmount CENT = 1000000;
 
 extern const std::string CURRENCY_UNIT;
-
-/** No amount larger than this (in satoshi) is valid.
- *
- * Note that this constant is *not* the total money supply, which in Bitcoin
- * currently happens to be less than 21,000,000 BTC for various reasons, but
- * rather a sanity check. As this sanity check is used by consensus-critical
- * validation code, the exact value of the MAX_MONEY constant is consensus
- * critical; in unusual circumstances like a(nother) overflow bug that allowed
- * for the creation of coins out of thin air modification could lead to a fork.
- * */
-//static const CAmount MAX_MONEY = 21000000 * COIN;
 extern int64_t MAX_MONEY;
 
 inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }

src/cc/CCPegs.h renamed to src/assetchain.h

@@ -1,3 +1,4 @@
+#pragma once
 /******************************************************************************
  * Copyright © 2014-2019 The SuperNET Developers.                             *
  *                                                                            *
@@ -12,25 +13,42 @@
  * Removal or modification of this copyright notice is prohibited.            *
  *                                                                            *
  ******************************************************************************/
+#include <string>
 
+class assetchain
+{
+public:
+    assetchain() : symbol_("") {}
+    assetchain(const std::string& symbol) : symbol_(symbol)
+    {
+        if (symbol_.size() > 64)
+            symbol_ = symbol_.substr(0, 64);
+    }
+    /*****
+     * @returns true if the chain is Komodo
+     */
+    bool isKMD() { return symbol_.empty(); }
+    /****
+     * @param in the symbol to compare
+     * @returns true if this chain's symbol matches
+     */
+    bool isSymbol(const std::string& in) { return in == symbol_; }
+    /****
+     * @returns this chain's symbol (will be empty for KMD)
+     */
+    std::string symbol() { return symbol_; }
+    /****
+     * @returns this chain's symbol, "KMD" in the case of Komodo
+     */
+    std::string ToString() 
+    { 
+        if (symbol_.empty()) 
+            return "KMD"; 
+        return symbol_; 
+    }
+    bool SymbolStartsWith(const std::string& in) { return symbol_.find(in) == 0; }
+private:
+    std::string symbol_;
+};
 
-#ifndef CC_PEGS_H
-#define CC_PEGS_H
-
-#include "CCinclude.h"
-
-bool PegsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
-
-// CCcustom
-UniValue PegsCreate(const CPubKey& pk,uint64_t txfee,int64_t amount,std::vector<uint256> bindtxids);
-UniValue PegsFund(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, int64_t amount);
-UniValue PegsGet(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, int64_t amount);
-UniValue PegsRedeem(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid);
-UniValue PegsLiquidate(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, uint256 liquidatetxid);
-UniValue PegsExchange(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, int64_t amount);
-UniValue PegsAccountHistory(const CPubKey& pk,uint256 pegstxid);
-UniValue PegsAccountInfo(const CPubKey& pk,uint256 pegstxid);
-UniValue PegsWorstAccounts(uint256 pegstxid);
-UniValue PegsInfo(uint256 pegstxid);
-
-#endif
+extern assetchain chainName;

src/bitcoin-cli.cpp

@@ -31,8 +31,10 @@
 #include <event2/buffer.h>
 #include <event2/keyvalq_struct.h>
 #include "support/events.h"
+#include "assetchain.h"
+
 uint16_t BITCOIND_RPCPORT = 7771;
-char ASSETCHAINS_SYMBOL[65];
+assetchain chainName;
 
 #include <univalue.h>
 
@@ -95,10 +97,9 @@ static int AppInitRPC(int argc, char* argv[])
     // Parameters
     //
     ParseParameters(argc, argv);
-    std:string name;
-    name = GetArg("-ac_name","");
+    std::string name = GetArg("-ac_name","");
     if ( !name.empty() )
-        strncpy(ASSETCHAINS_SYMBOL,name.c_str(),sizeof(ASSETCHAINS_SYMBOL)-1);
+        chainName = assetchain(name);
 
     if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
         std::string strUsage = _("Komodo RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();