Merge pull request KomodoPlatform#560 from Asherda/release-v1.1.2-1

Release-v1.1.2-1
who-biz · Nov 23, 2023 · e5156f8 · e5156f8
2 parents 65f766d + b6b8957
commit e5156f8
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 ########################################################################################################################
 variables:
 
-  VERSION: 1.1.2
+  VERSION: 1.1.2-1
 
   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.1.2
+## VerusCoin version 1.1.2-1
 
 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.1.2
+VerusCoin Command Line Tools v1.1.2-1
 
 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.1.2
+VerusCoin Command Line Tools v1.1.2-1
 
 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.1.2
+VerusCoin Command Line Tools v1.1.2-1
 
 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 = 2799000;
+static const int APPROX_RELEASE_HEIGHT = 2803000;
 
 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/pbaas/crosschainrpc.cpp b/src/pbaas/crosschainrpc.cpp
@@ -1110,7 +1110,7 @@ CCurrencyDefinition::CCurrencyDefinition(const UniValue &obj) :
 
                 CTxDestination preallocDest = DecodeDestination(preallocationKey[0]);
 
-                if (preallocDest.which() != COptCCParams::ADDRTYPE_ID && preallocDest.which() != COptCCParams::ADDRTYPE_INVALID)
+                if (preallocDest.which() != COptCCParams::ADDRTYPE_ID && (preallocationArr.size() == 1 && preallocDest.which() != COptCCParams::ADDRTYPE_INVALID))
                 {
                     LogPrintf("%s: preallocation destination must be an identity\n", __func__);
                     nVersion = PBAAS_VERSION_INVALID;

diff --git a/src/pbaas/pbaas.cpp b/src/pbaas/pbaas.cpp
@@ -6473,6 +6473,17 @@ bool CConnectedChains::StrictCheckIDExport(uint32_t height) const
     }
 }
 
+uint32_t CConnectedChains::DiscernBlockOneLaunchInfoHeight(bool getVerusHeight) const
+{
+    return (getVerusHeight || IsVerusActive()) ? (PBAAS_TESTMODE ? 302170 : 2824790) : 0;
+}
+
+bool CConnectedChains::DiscernBlockOneLaunchInfo(uint32_t height) const
+{
+    height = std::min(((uint32_t)chainActive.Height()), height);
+    return height >= DiscernBlockOneLaunchInfoHeight(false);
+}
+
 bool CConnectedChains::CheckClearConvert(uint32_t height) const
 {
     return (PBAAS_TESTMODE && chainActive.Height() >= (height - 1) && chainActive[height - 1]->nTime >= PBAAS_TESTFORK5_TIME) ||

diff --git a/src/pbaas/pbaas.h b/src/pbaas/pbaas.h
@@ -1216,6 +1216,9 @@ class CConnectedChains
     bool CheckClearConvert(uint32_t height) const;
     uint32_t StrictCheckIDExportHeight(bool getVerusHeight) const;
     bool StrictCheckIDExport(uint32_t height) const;
+    uint32_t DiscernBlockOneLaunchInfoHeight(bool getVerusHeight) const;
+    bool DiscernBlockOneLaunchInfo(uint32_t height) const;
+
 
     std::vector<CCurrencyDefinition> GetMergeMinedChains()
     {

diff --git a/src/rpc/pbaasrpc.cpp b/src/rpc/pbaasrpc.cpp
@@ -5841,7 +5841,7 @@ UniValue getcurrencyconverters(const UniValue& params, bool fHelp)
         CCoinbaseCurrencyState oneState = ConnectedChains.GetCurrencyState(pbn.currencyID, chainActive.Height(), true);
         if (!(oneState.IsValid() && oneState.IsLaunchConfirmed() && oneState.IsLaunchCompleteMarker()))
         {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot use pre-launch or refunded currency " + EncodeDestination(CIdentityID(toCurID)));
+            continue;
         }
         converterCurrencyOptions[pbn.currencyID] = {oneCur, oneState, std::map<uint160, CAmount>()};
     }
@@ -14717,7 +14717,11 @@ bool CConnectedChains::GetNotaryCurrencies(const CRPCChainData notaryChain,
 
         // get launch notarization from notary chain if on the notary chain or pre-block 1, and from block 1 if on
         // the PBaaS chain after it has been confirmed
-        if ((oneDef.IsPBaaSChain() || oneDef.IsGatewayConverter()) && oneDef.launchSystemID == notaryChain.GetID())
+        if ((oneDef.IsPBaaSChain() || oneDef.IsGatewayConverter()) &&
+            (!ConnectedChains.DiscernBlockOneLaunchInfo(chainActive.Height()) ||
+             (notaryChain.GetID() != ASSETCHAINS_CHAINID && oneDef.systemID == ASSETCHAINS_CHAINID) ||
+             (notaryChain.GetID() == ASSETCHAINS_CHAINID && oneDef.systemID != ASSETCHAINS_CHAINID)) &&
+            oneDef.launchSystemID == notaryChain.GetID())
         {
             if (notaryChain.GetID() == ASSETCHAINS_CHAINID || chainActive.Height() > 0)
             {

diff --git a/src/version.h b/src/version.h
@@ -35,6 +35,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.1.2"
+#define VERUS_VERSION "1.1.2-1"
 
 #endif // BITCOIN_VERSION_H