From 2f891b0e148fce4e64d605b2e527eb4440c0e32c Mon Sep 17 00:00:00 2001
From: ca333 <ca333@keemail.me>
Date: Mon, 20 Jan 2020 15:13:50 +0100
Subject: [PATCH 1/2] add opretmintxfee

---
 src/miner.cpp | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/miner.cpp b/src/miner.cpp
index 079e2bbf9..97270752f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -472,6 +472,40 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
 
             // Size limits
             unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
+
+            // Opret spam limits
+            if (mapArgs.count("-opretmintxfee"))
+            {
+                CAmount n = 0;
+                CFeeRate opretMinFeeRate;
+                if (ParseMoney(mapArgs["-opretmintxfee"], n) && n > 0)
+                    opretMinFeeRate = CFeeRate(n);
+                else
+                    opretMinFeeRate = CFeeRate(400000); // default opretMinFeeRate (1 KMD per 250 Kb = 0.004 per 1 Kb = 400000 sat per 1 Kb)
+
+                bool fSpamTx = false;
+                unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
+                unsigned int nTxOpretSize = 0;
+
+                // calc total oprets size
+                BOOST_FOREACH(const CTxOut& txout, tx.vout) {
+                    if (txout.scriptPubKey.IsOpReturn()) {
+                        CScript::const_iterator it = txout.scriptPubKey.begin() + 1;
+                        opcodetype op;
+                        std::vector<uint8_t> opretData;
+                        if (txout.scriptPubKey.GetOp(it, op, opretData)) {
+                            //std::cerr << HexStr(opretData.begin(), opretData.end()) << std::endl;
+                            nTxOpretSize += opretData.size();
+                        }
+                    }
+                }
+
+                if ((nTxOpretSize > 256) && (feeRate < opretMinFeeRate)) fSpamTx = true;
+                // std::cerr << tx.GetHash().ToString() << " nTxSize." << nTxSize << " nTxOpretSize." << nTxOpretSize << " feeRate." << feeRate.ToString() << " opretMinFeeRate." << opretMinFeeRate.ToString() << " fSpamTx." << fSpamTx << std::endl;
+                if (fSpamTx) continue;
+                // std::cerr << tx.GetHash().ToString() << " vecPriority.size() = " << vecPriority.size() << std::endl;
+            }
+
             if (nBlockSize + nTxSize >= nBlockMaxSize-512) // room for extra autotx
             {
                 //fprintf(stderr,"nBlockSize %d + %d nTxSize >= %d nBlockMaxSize\n",(int32_t)nBlockSize,(int32_t)nTxSize,(int32_t)nBlockMaxSize);

From b2b76e82dad450f2185e7b553af52b03ced01c15 Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sat, 29 Feb 2020 08:44:13 +0100
Subject: [PATCH 2/2] Change KMD to Hush in opretMinFeeRate unit

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 97270752f..5bc83fac4 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -481,7 +481,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
                 if (ParseMoney(mapArgs["-opretmintxfee"], n) && n > 0)
                     opretMinFeeRate = CFeeRate(n);
                 else
-                    opretMinFeeRate = CFeeRate(400000); // default opretMinFeeRate (1 KMD per 250 Kb = 0.004 per 1 Kb = 400000 sat per 1 Kb)
+                    opretMinFeeRate = CFeeRate(400000); // default opretMinFeeRate (1 HUSH per 250 Kb = 0.004 per 1 Kb = 400000 puposhis per 1 Kb)
 
                 bool fSpamTx = false;
                 unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);