Merge remote-tracking branch 'miketout/dev' into release-v1.2.3-3

who-biz · Jun 29, 2024 · fb45ba2 · fb45ba2
2 parents 643ddbe + fa88350
commit fb45ba2
Show file tree

Hide file tree

Showing 12 changed files with 318 additions and 78 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 ########################################################################################################################
 variables:
 
-  VERSION: 1.2.3-2
+  VERSION: 1.2.3-3
 
   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

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-## VerusCoin version 1.2.3-2
+## VerusCoin version 1.2.3-3
 
 Arguably the world's most advanced technology, zero knowledge privacy enabled, multi-chain blockchain protocol, Verus Public Blockchains as a Service (PBaaS) combines Sapling zero knowledge technology with an intelligent, multi-chain, provable protocol, using interchain smart transactions. Verus PBaaS also enables merge mining and cross-chain staking with a completely original, combined proof of stake/proof of work consensus algorithm, Proof of Power, that can be mined on CPUs and mobile phones, and also 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 blockchain networks in existence.
 

diff --git a/doc/man/verus-cli/linux/README.txt b/doc/man/verus-cli/linux/README.txt
@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v1.2.3-2
+VerusCoin Command Line Tools v1.2.3-3
 
 Contents:
 verusd - VerusCoin daemon

diff --git a/doc/man/verus-cli/mac/README.txt b/doc/man/verus-cli/mac/README.txt
@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v1.2.3-2
+VerusCoin Command Line Tools v1.2.3-3
 
 Contents:
 verusd - VerusCoin daemon.

diff --git a/doc/man/verus-cli/windows/README.txt b/doc/man/verus-cli/windows/README.txt
@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v1.2.3-2
+VerusCoin Command Line Tools v1.2.3-3
 
 Contents:
 verusd.exe - VerusCoin daemon

diff --git a/src/deprecation.h b/src/deprecation.h
@@ -9,7 +9,7 @@
 // * Shut down 52 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 2 months' worth of blocks prior to shut down.
 
-static const int APPROX_RELEASE_HEIGHT = 3090000;
+static const int APPROX_RELEASE_HEIGHT = 3108000;
 
 static const int WEEKS_UNTIL_DEPRECATION = 52;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 60 * 24);

diff --git a/src/init.cpp b/src/init.cpp
@@ -405,6 +405,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-maxconnections=<n>", strprintf(_("Maintain at most <n> connections to peers (default: %u)"), DEFAULT_MAX_PEER_CONNECTIONS));
     strUsage += HelpMessageOpt("-maxreceivebuffer=<n>", strprintf(_("Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)"), 5000));
     strUsage += HelpMessageOpt("-maxsendbuffer=<n>", strprintf(_("Maximum per-connection send buffer, <n>*1000 bytes (default: %u)"), 1000));
+    strUsage += HelpMessageOpt("-maximumimportrange=<n>", strprintf(_("Maximum number of blocks for an import range query or getcurrencystate with volume, (default: unlimited)")));
     strUsage += HelpMessageOpt("-onion=<ip:port>", strprintf(_("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)"), "-proxy"));
     strUsage += HelpMessageOpt("-onlynet=<net>", _("Only connect to nodes in network <net> (ipv4, ipv6 or onion)"));
     strUsage += HelpMessageOpt("-permitbaremultisig", strprintf(_("Relay non-P2SH multisig (default: %u)"), 1));
@@ -1362,6 +1363,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // initialization, and this is the first time we can get it. store the Sapling address here
     extern boost::optional<libzcash::SaplingPaymentAddress> defaultSaplingDest;
     VERUS_DEFAULT_ZADDR = GetArg("-cheatcatcher", "");
+    VERUS_DEFAULT_ZADDR = GetArg("-stakeguard", VERUS_DEFAULT_ZADDR); // TODO: should separate stakeguard/cheatcatcher from the default change address
     VERUS_DEFAULT_ZADDR = GetArg("-defaultzaddr", VERUS_DEFAULT_ZADDR);
     libzcash::PaymentAddress addr = DecodePaymentAddress(VERUS_DEFAULT_ZADDR);
     if (VERUS_DEFAULT_ZADDR.size() > 0 && IsValidPaymentAddress(addr))

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -4483,7 +4483,7 @@ void static BitcoinMiner_noeq()
 
                     bool tryAgain = true;
                     int retryCount = 0;
-                    while (tryAgain && retryCount++ < 2)
+                    while (tryAgain && retryCount++ < 5)
                     {
                         tryAgain = false;
                         params.push_back(EncodeHexBlk(*pblock));
@@ -4495,8 +4495,8 @@ void static BitcoinMiner_noeq()
                         {
                             ConnectedChains.lastSubmissionFailed = false;
                             params = RPCCallRoot("addmergedblock", params);
-                            params = find_value(params, "result");
                             error = find_value(params, "error");
+                            params = find_value(params, "result");
                         } catch (std::exception e)
                         {
                             LogPrintf("Failed to connect to %s chain\n", ConnectedChains.FirstNotaryChain().chainDefinition.name.c_str());

diff --git a/src/pbaas/reserves.cpp b/src/pbaas/reserves.cpp
@@ -830,7 +830,7 @@ CCurrencyValueMap CCoinbaseCurrencyState::TargetConversionPrices(const uint160 &
     }
     else
     {
-        retVal.valueMap[GetID()] = NativeToReserveRaw(SATOSHIDEN, currencyMap.valueMap[targetCurrencyID]);
+        retVal.valueMap[GetID()] = ReserveToNativeRaw(SATOSHIDEN, currencyMap.valueMap[targetCurrencyID]);
 
         for (auto &oneCur : currencies)
         {
@@ -863,7 +863,7 @@ CCurrencyValueMap CCoinbaseCurrencyState::TargetConversionPrices(const uint160 &
     }
     else
     {
-        retVal.valueMap[GetID()] = NativeToReserveRaw(SATOSHIDEN, prices.valueMap.find(targetCurrencyID)->second);
+        retVal.valueMap[GetID()] = ReserveToNativeRaw(SATOSHIDEN, prices.valueMap.find(targetCurrencyID)->second);
 
         for (auto &oneCur : currencies)
         {
@@ -906,7 +906,7 @@ CCurrencyValueMap CCoinbaseCurrencyState::TargetLastConversionPrices(const uint1
                 SATOSHIDEN :
                 NativeToReserveRaw(ReserveToNativeRaw(SATOSHIDEN, viaCurrencyMap.valueMap[targetCurrencyID]), currencyMap.valueMap[oneCur]);
         }
-        retVal.valueMap[GetID()] = NativeToReserveRaw(SATOSHIDEN, currencyMap.valueMap[targetCurrencyID]);
+        retVal.valueMap[GetID()] = ReserveToNativeRaw(SATOSHIDEN, currencyMap.valueMap[targetCurrencyID]);
     }
     return retVal;
 }
@@ -2789,7 +2789,6 @@ CReserveTransactionDescriptor::CReserveTransactionDescriptor(const CTransaction
                     {
                         if (p.evalCode == EVAL_IDENTITY_ADVANCEDRESERVATION && identity.name == anr.name && identity.parent == anr.parent)
                         {
-                            // TDOD: HARDENING potentially finish validating the fees according to the currency
                             flags |= IS_IDENTITY_DEFINITION + IS_HIGH_FEE;
                             reservationValid = advancedReservationValid = true;
                         }

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -107,9 +107,12 @@ UniValue getinfo(const UniValue& params, bool fHelp)
 
     proxyType proxy;
     GetProxy(NET_IPV4, proxy);
-    notarized_height = komodo_notarized_height(&prevMoMheight,&notarized_hash,&notarized_desttxid);
+
+    //notarized_height = komodo_notarized_height(&prevMoMheight,&notarized_hash,&notarized_desttxid);
     //fprintf(stderr,"after notarized_height %u\n",(uint32_t)time(NULL));
 
+    CProofRoot confirmedRoot = ConnectedChains.FinalizedChainRoot();
+
     UniValue obj(UniValue::VOBJ);
     obj.push_back(Pair("VRSCversion", VERUS_VERSION));
     obj.push_back(Pair("version", CLIENT_VERSION));
@@ -120,18 +123,11 @@ UniValue getinfo(const UniValue& params, bool fHelp)
         obj.push_back(Pair("notarychainid", EncodeDestination(CIdentityID(ConnectedChains.FirstNotaryChain().GetID()))));
     }
     obj.push_back(Pair("name", ConnectedChains.GetFriendlyCurrencyName(ASSETCHAINS_CHAINID)));
-    obj.push_back(Pair("notarized", notarized_height));
-    obj.push_back(Pair("prevMoMheight", prevMoMheight));
-    obj.push_back(Pair("notarizedhash", notarized_hash.ToString()));
-    obj.push_back(Pair("notarizedtxid", notarized_desttxid.ToString()));
-    txid_height = notarizedtxid_height(ASSETCHAINS_SYMBOL[0] != 0 ? (char *)"KMD" : (char *)"BTC",(char *)notarized_desttxid.ToString().c_str(),&kmdnotarized_height);
-    if ( txid_height > 0 )
-        obj.push_back(Pair("notarizedtxid_height", txid_height));
-    else obj.push_back(Pair("notarizedtxid_height", "mempool"));
-    if ( ASSETCHAINS_SYMBOL[0] != 0 )
-        obj.push_back(Pair("KMDnotarized_height", kmdnotarized_height));
-    obj.push_back(Pair("notarized_confirms", txid_height < kmdnotarized_height ? (kmdnotarized_height - txid_height + 1) : 0));
-    //fprintf(stderr,"after notarized_confirms %u\n",(uint32_t)time(NULL));
+    if (confirmedRoot.IsValid())
+    {
+        obj.push_back(Pair("notarizedroot", confirmedRoot.ToUniValue()));
+    }
+
 #ifdef ENABLE_WALLET
     if (pwalletMain) {
         obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));