Merge pull request jl777#370 from VerusCoin/dev

Dev

Author: Asherda

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 ########################################################################################################################
 variables:
 
-  VERSION: 0.9.0-1
+  VERSION: 0.9.0-2
 
   VERUS_CLI_ARM64_LINUX: Verus-CLI-Linux-v${VERSION}-arm64.tar.gz
   VERUS_CLI_LINUX_X86_64: Verus-CLI-Linux-v${VERSION}-x86_64.tar.gz

README.md

@@ -1,5 +1,5 @@
 
-## VerusCoin version 0.9.0-1
+## VerusCoin version 0.9.0-2
 
 Arguably the world's most advanced technology, zero knowledge privacy-centric blockchain, Verus Coin brings Sapling performance and zero knowledge features to an intelligent system with interchain smart contracts and a completely original, combined proof of stake/proof of work consensus algorithm that solves the nothing at stake problem. With this and its approach towards CPU mining and ASICs, Verus Coin strives to be one of the most naturally decentralizing and attack resistant blockchains in existence.
 

doc/man/verus-cli/linux/README.txt

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.0-1
+VerusCoin Command Line Tools v0.9.0-2
 
 Contents:
 verusd - VerusCoin daemon

doc/man/verus-cli/mac/README.txt

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.0-1
+VerusCoin Command Line Tools v0.9.0-2
 
 Contents:
 verusd - VerusCoin daemon.

doc/man/verus-cli/windows/README.txt

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v0.9.0-1
+VerusCoin Command Line Tools v0.9.0-2
 
 Contents:
 verusd.exe - VerusCoin daemon

src/Makefile.am

@@ -8,6 +8,9 @@
 
 DIST_SUBDIRS = secp256k1 univalue cryptoconditions
 
+# AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(SAN_LDFLAGS) $(HARDENED_LDFLAGS) -Wl,--no-as-needed,-lprofiler,--as-needed
+# AM_CXXFLAGS = $(SAN_CXXFLAGS) $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS) -Wl,--no-as-needed -lprofiler -Wl,--as-needed
+# AM_CPPFLAGS = $(HARDENED_CPPFLAGS) -Wl,--no-as-needed -lprofiler -Wl,--as-needed
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(SAN_LDFLAGS) $(HARDENED_LDFLAGS)
 AM_CXXFLAGS = $(SAN_CXXFLAGS) $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS)
 AM_CPPFLAGS = $(HARDENED_CPPFLAGS)
@@ -540,6 +543,7 @@ libbitcoin_common_a_SOURCES = \
   metrics.cpp \
   mmr.cpp \
   pbaas/ethproof.cpp \
+  pbaas/crosschainrpc.h \
   pbaas/crosschainrpc.cpp \
   pbaas/vdxf.cpp \
   primitives/block.cpp \
@@ -594,6 +598,7 @@ endif
 libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_cli_a_SOURCES = \
+  arith_uint256.cpp \
   rpc/client.cpp \
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
@@ -777,6 +782,8 @@ libzcashconsensus_la_SOURCES = \
   crypto/sha256.cpp \
   crypto/sha512.cpp \
   hash.cpp \
+  pbaas/crosschainrpc.h \
+  pbaas/crosschainrpc.cpp \
   primitives/transaction.cpp \
   primitives/nonce.cpp \
   pubkey.cpp \

src/bitcoind.cpp

@@ -47,10 +47,12 @@ extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 void komodo_passport_iteration();
 uint64_t komodo_interestsum();
 int32_t komodo_longestchain();
+UniValue closeoffers(const UniValue& params, bool fHelp);
 
 void WaitForShutdown(boost::thread_group* threadGroup)
 {
     bool fShutdown = ShutdownRequested();
+    int64_t curTimeSec = (GetTimeMillis() / 1000);
     // Tell the main threads to shutdown.
     while (!fShutdown)
     {
@@ -66,6 +68,22 @@ void WaitForShutdown(boost::thread_group* threadGroup)
             komodo_longestchain();
             MilliSleep(20000);
         }
+        // attempt to close any open offers every 5 minutes
+        if (pwalletMain &&
+            ((GetTimeMillis() / 1000) - curTimeSec) > 300 &&
+            !IsInitialBlockDownload(Params()))
+        {
+            try
+            {
+                UniValue params(UniValue::VARR);
+                closeoffers(params, false);
+            }
+            catch(...)
+            {
+                //LogPrintf("%s: Error %s\n", __func__, e.what());
+            }
+            curTimeSec = (GetTimeMillis() / 1000);
+        }
         fShutdown = ShutdownRequested();
     }
     if (threadGroup)