Merge pull request KomodoPlatform#550 from Asherda/release-v1.1.1-6

Release v1.1.1-6

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 ########################################################################################################################
 variables:
 
-  VERSION: 1.1.1-5
+  VERSION: 1.1.1-6
 
   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.1.1-5
+## VerusCoin version 1.1.1-6
 
 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.1.1-5
+VerusCoin Command Line Tools v1.1.1-6
 
 Contents:
 verusd - VerusCoin daemon

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

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v1.1.1-5
+VerusCoin Command Line Tools v1.1.1-6
 
 Contents:
 verusd - VerusCoin daemon.

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

@@ -1,5 +1,5 @@
 
-VerusCoin Command Line Tools v1.1.1-5
+VerusCoin Command Line Tools v1.1.1-6
 
 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 = 2740000;
+static const int APPROX_RELEASE_HEIGHT = 2744000;
 
 static const int WEEKS_UNTIL_DEPRECATION = 52;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 60 * 24);

src/main.cpp

@@ -2210,29 +2210,17 @@ bool AcceptToMemoryPoolInt(CTxMemPool& pool, CValidationState &state, const CTra
         unsigned int nSize = entry.GetTxSize();
 
         int64_t maxFreeSizeLimit = GetArg("-limitfreerelay", 15)*1000;
-        int64_t defaultLimitRate = maxFreeSizeLimit*10;
+        int64_t defaultLimitRate = maxFreeSizeLimit * 10;
 
         CAmount minFee = GetMinRelayFeeByOutputs(txDesc, tx, state, identityFeeFactor);
         if (state.IsError())
         {
             return false;
         }
 
-        if (!identityFeeFactor)
-        {
-            minFee = std::min(minFee, GetMinRelayFee(tx, nSize, defaultLimitRate != 0));
-        }
-
-        // Don't accept it if it doesn't meet minimum fees
-        if (fLimitFree && nFees < minFee)
-        {
-            //fprintf(stderr,"accept failure.5\n");
-            return state.DoS(0, error("AcceptToMemoryPool: not enough fees %s, %d < %d",hash.ToString(), nFees, minFee),REJECT_INSUFFICIENTFEE, "insufficient fee");
-        }
-
         if (GetBoolArg("-relaypriority", false) && nFees < minFee && !AllowFree(view.GetPriority(tx, chainActive.Height() + 1))) {
             fprintf(stderr,"accept failure.6\n");
-            return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "insufficient priority");
+            return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "insufficient priority for fee");
         }
 
         // Continuously rate-limit free (really, very-low-fee) transactions
@@ -2246,7 +2234,8 @@ bool AcceptToMemoryPoolInt(CTxMemPool& pool, CValidationState &state, const CTra
         // recognize those imports, exempt block 1, or consider using fees from the initial
         // currency definition. Exports pay delayed fees back, imports allow fees to keep flowing.
         if (!(txDesc.IsValid() && (txDesc.IsImport() || txDesc.IsExport() || txDesc.IsNotaryPrioritized())) &&
-            fLimitFree && nFees < minFee)
+            fLimitFree &&
+            nFees < minFee)
         {
             static CCriticalSection csFreeLimiter;
             static double dFreeCount;
@@ -2266,12 +2255,16 @@ bool AcceptToMemoryPoolInt(CTxMemPool& pool, CValidationState &state, const CTra
                 fprintf(stderr,"AcceptToMemoryPool failure.7\n");
                 return state.DoS(0, error("AcceptToMemoryPool: free transaction rejected by rate limiter"), REJECT_INSUFFICIENTFEE, "rate limited free transaction");
             }
-            LogPrint("mempool", "Rate limit dFreeCount: %g => %g\n", dFreeCount, dFreeCount+nSize);
+            LogPrint("mempool", "Rate limit dFreeCount: %g => %g\n", dFreeCount, dFreeCount + nSize);
             dFreeCount += nSize;
         }
 
         // make sure this will check any normal error case and not fail with exchanges, exports/imports, identities, etc.
-        if ((!txDesc.IsValid() || !txDesc.IsHighFee()) && fRejectAbsurdFee && nFees > minFee * 10000 && nFees > nValueOut/19)
+        if ((!txDesc.IsValid() || !txDesc.IsHighFee()) &&
+            fRejectAbsurdFee &&
+            nFees > minFee * 10000 &&
+            nFees > (GetMinRelayFee(tx, nSize, defaultLimitRate != 0) * 10000) &&
+            nFees > nValueOut/19)
         {
             string errmsg = strprintf("absurdly high fees %s, %d > %d",
                                       hash.ToString(),

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