Merge pull request KomodoPlatform#572 from Asherda/release-v1.2.2-3

Release v1.2.2-3

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 ########################################################################################################################
 variables:
 
-  VERSION: 1.2.2-2
+  VERSION: 1.2.2-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

README.md

@@ -1,5 +1,5 @@
 
-## VerusCoin version 1.2.2-2
+## VerusCoin version 1.2.2-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.
 

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

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v1.2.2-2
+VerusCoin Command Line Tools v1.2.2-3
 
 Contents:
 verusd - VerusCoin daemon

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

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v1.2.2-2
+VerusCoin Command Line Tools v1.2.2-3
 
 Contents:
 verusd - VerusCoin daemon.

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

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v1.2.2-2
+VerusCoin Command Line Tools v1.2.2-3
 
 Contents:
 verusd.exe - VerusCoin daemon

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 = 2991000;
+static const int APPROX_RELEASE_HEIGHT = 3000000;
 
 static const int WEEKS_UNTIL_DEPRECATION = 52;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 60 * 24);

src/pbaas/pbaas.cpp

@@ -6325,6 +6325,16 @@ void CConnectedChains::CheckOracleUpgrades()
     }
 
     CUpgradeDescriptor oneUpgrade;
+
+    // compatible with vARRR update notarization modulo reset, even if no
+    // or different oracle used
+    if (IsVerusMainnetActive() &&
+        height >= vARRRUpdateHeight(false) &&
+        (height - vARRRUpdateHeight(false)) < 800)
+    {
+        activeUpgradesByKey[ResetNotarizationModuloKey()] = CUpgradeDescriptor(ResetNotarizationModuloKey(), 16908802, 3000000, 0);
+    }
+
     if (upgradeData.size())
     {
         for (auto &oneUpgrade : upgradeData)
@@ -6505,6 +6515,29 @@ bool CConnectedChains::vARRRUpdateEnabled(uint32_t height) const
     return height >= vARRRUpdateHeight(false);
 }
 
+uint160 CConnectedChains::vARRRChainID() const
+{
+    static uint160 vARRRID = GetDestinationID(DecodeDestination("iExBJfZYK7KREDpuhj6PzZBzqMAKaFg7d2"));
+    return vARRRID;
+}
+
+bool CConnectedChains::ForceIdentityUpgrade(uint32_t height) const
+{
+    if (vARRRChainID() != ASSETCHAINS_CHAINID || height >= 18250)
+    {
+        return true;
+    }
+
+    auto iiuIt = ConnectedChains.activeUpgradesByKey.find(ConnectedChains.ForceIdentityUpgradeKey());
+    if (iiuIt != ConnectedChains.activeUpgradesByKey.end() &&
+        height >= iiuIt->second.upgradeBlockHeight)
+    {
+        return true;
+    }
+
+    return false;
+}
+
 bool CConnectedChains::ConfigureEthBridge(bool callToCheck)
 {
     // first time through, we initialize the VETH gateway config file

src/pbaas/pbaas.h

@@ -1222,6 +1222,8 @@ class CConnectedChains
     bool AutoArbitrageEnabled(uint32_t height) const;
     uint32_t vARRRUpdateHeight(bool getVerusHeight) const;
     bool vARRRUpdateEnabled(uint32_t height) const;
+    uint160 vARRRChainID() const;
+    bool ForceIdentityUpgrade(uint32_t height) const;
 
     std::vector<CCurrencyDefinition> GetMergeMinedChains()
     {
@@ -1305,6 +1307,18 @@ class CConnectedChains
         return key;
     }
 
+    static std::string ForceIdentityUpgradeKeyName()
+    {
+        return "vrsc::system.upgradedata.forceidentityupgrade";
+    }
+
+    static uint160 ForceIdentityUpgradeKey()
+    {
+        static uint160 nameSpace;
+        static uint160 key = CVDXF_Data::GetDataKey(ForceIdentityUpgradeKeyName(), nameSpace);
+        return key;
+    }
+
     static std::string DisablePBaaSCrossChainKeyName()
     {
         return "vrsc::system.upgradedata.disablepbaascrosschain";

src/pbaas/reserves.cpp

@@ -3889,6 +3889,11 @@ bool CReserveTransfer::GetTxOut(const CCurrencyDefinition &sourceSystem,
                 return false;
             }
 
+            if (ConnectedChains.ForceIdentityUpgrade(height))
+            {
+                importedID.UpgradeVersion(height);
+            }
+
             // check for collisions and if not present, make an ID output
             bool idCollision = false, currencyCollision = false;
 

src/rpc/misc.cpp

@@ -735,6 +735,11 @@ uint256 HashFile(const std::string &filepath, CNativeHashWriter &ss)
 
 uint256 HashFile(const std::string &filepath)
 {
+    if (!GetBoolArg("-enablefileencryption", true))
+    {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot read file: " + filepath + " for data output");
+    }
+
     CNativeHashWriter hw(CCurrencyDefinition::EHashTypes::HASH_SHA256);
     return HashFile(filepath, hw);
 }

src/rpc/pbaasrpc.cpp

@@ -15629,6 +15629,8 @@ bool CConnectedChains::GetNotaryIDs(const CRPCChainData notaryChain,
             oneDef.contentMultiMap.clear();
         }
 
+        oneDef.UpgradeVersion(1);
+
         {
             identities[oneDef.GetID()] = oneDef;
         }

src/version.h

@@ -36,6 +36,6 @@ static const int MEMPOOL_GD_VERSION = 60002;
 static const int NO_BLOOM_VERSION = 170004;
 
 #define KOMODO_VERSION "0.2.1"
-#define VERUS_VERSION "1.2.2-2"
+#define VERUS_VERSION "1.2.2-3"
 
 #endif // BITCOIN_VERSION_H

src/wallet/rpcwallet.cpp

@@ -1423,6 +1423,10 @@ size_t GetDataMessage(const UniValue &uni, CVDXF::EHashTypes hashType, std::vect
     }
     else if (!strFileName.empty())
     {
+        if (!GetBoolArg("-enablefileencryption", false))
+        {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot read file: " + strFileName + " for data output");
+        }
         int bytesRead = FileToVector(strFileName, dataVec, MAX_TX_SIZE_AFTER_SAPLING >> 1);
         if (!bytesRead)
         {