Merge pull request jl777#329 from VerusCoin/dev

Dev
Mr-Bossman · May 10, 2021 · 01e44d4 · 01e44d4
2 parents d53d211 + f51d780
commit 01e44d4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 ####START####                                     PROJECT LEVEL VARIABLES                                  ####START####
 ########################################################################################################################
 variables:
-  VERSION: 0.7.3-2
+  VERSION: 0.7.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
   VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## VerusCoin version 0.7.3-2
+## VerusCoin version 0.7.3-3
 
 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.
 

diff --git a/doc/man/verus-cli/linux/README.txt b/doc/man/verus-cli/linux/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.7.3-2
+VerusCoin Command Line Tools v0.7.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,4 +1,4 @@
-VerusCoin Command Line Tools v0.7.3-2
+VerusCoin Command Line Tools v0.7.3-3
 Contents:
 verusd - VerusCoin daemon.
 verus - VerusCoin command line utility.

diff --git a/doc/man/verus-cli/windows/README.txt b/doc/man/verus-cli/windows/README.txt
@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.7.3-2
+VerusCoin Command Line Tools v0.7.3-3
 Contents:
 verusd.exe - VerusCoin daemon
 verus.exe - VerusCoin command line utility

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

diff --git a/src/pbaas/identity.h b/src/pbaas/identity.h
@@ -565,10 +565,11 @@ class CIdentity : public CPrincipal
         auto nSolVersion = CConstVerusSolutionVector::GetVersionByHeight(height);
         if (parent != newIdentity.parent ||
             (nSolVersion < CActivationHeight::ACTIVATE_IDCONSENSUS2 && name != newIdentity.name) ||
-            (nSolVersion < CActivationHeight::ACTIVATE_PBAAS && (newIdentity.HasActiveCurrency() || 
-                                                                 newIdentity.IsLocked() ||
-                                                                 !newIdentity.systemID.IsNull() ||
-                                                                 newIdentity.nVersion >= VERSION_PBAAS)) ||
+            (nSolVersion >= CActivationHeight::ACTIVATE_IDCONSENSUS2 &&
+             nSolVersion < CActivationHeight::ACTIVATE_PBAAS && 
+             (newIdentity.HasActiveCurrency() || 
+              newIdentity.IsLocked() ||
+              newIdentity.nVersion >= VERSION_PBAAS)) ||
             (nSolVersion >= CActivationHeight::ACTIVATE_PBAAS && (newIdentity.nVersion < VERSION_PBAAS ||
                                                                   (newIdentity.systemID != (nVersion < VERSION_PBAAS ? parent : systemID)))) ||
             GetID() != newIdentity.GetID() ||

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 "0.7.3-2"
+#define VERUS_VERSION "0.7.3-3"
 
 #endif // BITCOIN_VERSION_H