Merge pull request KomodoPlatform#551 from Asherda/release-v1.1.1-7

Release v1.1.1-7
who-biz · Oct 12, 2023 · 434bf25 · 434bf25
2 parents 72f598e + dd0013d
commit 434bf25
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 ########################################################################################################################
 variables:
 
-  VERSION: 1.1.1-6
+  VERSION: 1.1.1-7
 
   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.1-6
+## VerusCoin version 1.1.1-7
 
 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.1-6
+VerusCoin Command Line Tools v1.1.1-7
 
 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.1-6
+VerusCoin Command Line Tools v1.1.1-7
 
 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.1-6
+VerusCoin Command Line Tools v1.1.1-7
 
 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 = 2744000;
+static const int APPROX_RELEASE_HEIGHT = 2746000;
 
 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/main.cpp b/src/main.cpp
@@ -2223,7 +2223,7 @@ bool AcceptToMemoryPoolInt(CTxMemPool& pool, CValidationState &state, const CTra
             return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "insufficient priority for fee");
         }
 
-        // Continuously rate-limit free (really, very-low-fee) transactions
+        // Continuously rate-limit free or very-low-fee transactions
         // This mitigates 'penny-flooding' -- sending thousands of free transactions just to
         // be annoying or make others' transactions take longer to confirm.
         //

diff --git a/src/pbaas/crosschainrpc.cpp b/src/pbaas/crosschainrpc.cpp
@@ -252,7 +252,7 @@ UniValue RPCCallRoot(const string& strMethod, const UniValue& params, int timeou
         {
             PBAAS_USERPASS = userIt->second[0] + ":" + passIt->second[0];
             PBAAS_PORT = atoi(portIt->second[0]);
-            PBAAS_HOST = hostIt == settingsmulti.end() ? hostIt->second[0] : "127.0.0.1";
+            PBAAS_HOST = hostIt != settingsmulti.end() ? hostIt->second[0] : "127.0.0.1";
             if (!PBAAS_HOST.size())
             {
                 PBAAS_HOST = "127.0.0.1";

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.1-6"
+#define VERUS_VERSION "1.1.1-7"
 
 #endif // BITCOIN_VERSION_H