fluid: remove leftover fragments from refactoring

kwvg · kwvg · commit 938795020ad5 · 2021-08-29T23:54:50.000+05:30
diff --git a/src/fluid/dynode.cpp b/src/fluid/dynode.cpp
@@ -5,26 +5,22 @@
 
 #include "core_io.h"
 #include "fluid/fluid.h"
+#include "fluid/script.h"
 #include "operations.h"
 #include "script/script.h"
 
 #include <boost/thread.hpp>
 
 CFluidDynodeDB* pFluidDynodeDB = NULL;
 
-bool GetFluidDynodeData(const CScript& scriptPubKey, CFluidDynode& entry)
-{
-    return ParseScript(scriptPubKey, entry);
-}
-
 bool GetFluidDynodeData(const CTransaction& tx, CFluidDynode& entry, int& nOut)
 {
     int n = 0;
     for (const CTxOut& txout : tx.vout) {
         CScript txOut = txout.scriptPubKey;
-        if (IsTransactionFluid(txOut)) {
+        if (WithinFluidRange(txOut.GetFlag())) {
             nOut = n;
-            return GetFluidDynodeData(txOut, entry);
+            return ParseScript(txOut, entry);
         }
         n++;
     }
@@ -42,7 +38,7 @@ bool CFluidDynode::UnserializeFromTx(const CTransaction& tx)
 
 bool CFluidDynode::UnserializeFromScript(const CScript& fluidScript)
 {
-    if (!GetFluidDynodeData(fluidScript, *this)) {
+    if (!ParseScript(fluidScript, *this)) {
         return false;
     }
     return true;
diff --git a/src/fluid/dynode.h b/src/fluid/dynode.h
@@ -54,9 +54,6 @@ class CFluidDynodeDB : public CDBWrapper
     bool RecordExists(const std::vector<unsigned char>& vchFluidScript);
 };
 
-bool GetFluidDynodeData(const CScript& scriptPubKey, CFluidDynode& entry);
-bool GetFluidDynodeData(const CTransaction& tx, CFluidDynode& entry, int& nOut);
-
 extern CFluidDynodeDB* pFluidDynodeDB;
 
 #endif // FLUID_DYNODE_H
diff --git a/src/fluid/fluid.cpp b/src/fluid/fluid.cpp
@@ -31,16 +31,11 @@ CFluid fluid;
 extern CWallet* pwalletMain;
 #endif //ENABLE_WALLET
 
-bool IsTransactionFluid(const CScript& txOut)
-{
-    return WithinFluidRange(txOut.GetFlag());
-}
-
 bool IsTransactionFluid(const CTransaction& tx, CScript& fluidScript)
 {
     for (const CTxOut& txout : tx.vout) {
         CScript txOut = txout.scriptPubKey;
-        if (IsTransactionFluid(txOut)) {
+        if (WithinFluidRange(txOut.GetFlag())) {
             fluidScript = txOut;
             return true;
         }
@@ -122,7 +117,7 @@ bool CFluid::CheckIfExistsInMemPool(const CTxMemPool& pool, const CScript& fluid
     for (const CTxMemPoolEntry& e : pool.mapTx) {
         const CTransaction& tx = e.GetTx();
         for (const CTxOut& txOut : tx.vout) {
-            if (IsTransactionFluid(txOut.scriptPubKey)) {
+            if (WithinFluidRange(txOut.scriptPubKey.GetFlag())) {
                 return (GetRidOfScriptStatement(ScriptToAsmStr(fluidScriptPubKey)) == GetRidOfScriptStatement(ScriptToAsmStr(txOut.scriptPubKey)));
             }
         }
@@ -438,7 +433,7 @@ bool CFluid::GetMintingInstructions(const CBlockIndex* pblockindex, CDynamicAddr
 /* Check if transaction exists in record */
 bool CFluid::CheckTransactionInRecord(const CScript& fluidInstruction, CBlockIndex* pindex)
 {
-    if (IsTransactionFluid(fluidInstruction)) {
+    if (WithinFluidRange(fluidInstruction.GetFlag())) {
         std::string verificationString = ScriptToAsmStr(fluidInstruction);
         std::vector<std::string> transactionRecord;
         std::string verificationWithoutOpCode = GetRidOfScriptStatement(verificationString);
@@ -490,7 +485,7 @@ bool CFluid::ValidationProcesses(CValidationState& state, const CScript& txOut,
     CAmount mintAmount;
     CDynamicAddress toMintAddress;
 
-    if (IsTransactionFluid(txOut)) {
+    if (WithinFluidRange(txOut.GetFlag())) {
         if (!CheckIfQuorumExists(ScriptToAsmStr(txOut), message)) {
             return state.DoS(100, false, REJECT_INVALID, "bad-txns-fluid-auth-failure");
         }
@@ -515,7 +510,7 @@ bool CFluid::ProvisionalCheckTransaction(const CTransaction& transaction)
     for (const CTxOut& txout : transaction.vout) {
         CScript txOut = txout.scriptPubKey;
 
-        if (IsTransactionFluid(txOut) && CheckTransactionInRecord(txOut)) {
+        if (WithinFluidRange(txOut.GetFlag()) && CheckTransactionInRecord(txOut)) {
             LogPrintf("ProvisionalCheckTransaction(): Fluid Transaction %s has already been executed!\n", transaction.GetHash().ToString());
             return false;
         }
@@ -540,7 +535,7 @@ bool CFluid::CheckTransactionToBlock(const CTransaction& transaction, const uint
     for (const CTxOut& txout : transaction.vout) {
         CScript txOut = txout.scriptPubKey;
 
-        if (IsTransactionFluid(txOut) && CheckTransactionInRecord(txOut, pblockindex)) {
+        if (WithinFluidRange(txOut.GetFlag()) && CheckTransactionInRecord(txOut, pblockindex)) {
             LogPrintf("CheckTransactionToBlock(): Fluid Transaction %s has already been executed!\n", transaction.GetHash().ToString());
             return false;
         }
diff --git a/src/fluid/fluid.h b/src/fluid/fluid.h
@@ -195,14 +195,12 @@ CAmount GetStandardPoWBlockPayment(const int& nHeight);
 CAmount GetStandardDynodePayment(const int& nHeight);
 
 void BuildFluidInformationIndex(CBlockIndex* pindex, CAmount& nExpectedBlockValue, bool fDynodePaid);
-bool IsTransactionFluid(const CScript& txOut);
 bool IsTransactionFluid(const CTransaction& tx, CScript& fluidScript);
 int GetFluidOpCode(const CScript& fluidScript);
 
 std::vector<unsigned char> CharVectorFromString(const std::string& str);
 std::string StringFromCharVector(const std::vector<unsigned char>& vch);
 std::vector<unsigned char> FluidScriptToCharVector(const CScript& fluidScript);
-bool GetFluidBlock(const CBlockIndex* pblockindex, CBlock& block);
 
 template <typename T1>
 bool ParseScript(const CScript& scriptPubKey, T1& object);
diff --git a/src/fluid/mining.cpp b/src/fluid/mining.cpp
@@ -5,26 +5,22 @@
 
 #include "core_io.h"
 #include "fluid/fluid.h"
+#include "fluid/script.h"
 #include "operations.h"
 #include "script/script.h"
 
 #include <boost/thread.hpp>
 
 CFluidMiningDB* pFluidMiningDB = NULL;
 
-bool GetFluidMiningData(const CScript& scriptPubKey, CFluidMining& entry)
-{
-    return ParseScript(scriptPubKey, entry);
-}
-
 bool GetFluidMiningData(const CTransaction& tx, CFluidMining& entry, int& nOut)
 {
     int n = 0;
     for (const CTxOut& txout : tx.vout) {
         CScript txOut = txout.scriptPubKey;
-        if (IsTransactionFluid(txOut)) {
+        if (WithinFluidRange(txOut.GetFlag())) {
             nOut = n;
-            return GetFluidMiningData(txOut, entry);
+            return ParseScript(txOut, entry);
         }
         n++;
     }
@@ -42,7 +38,7 @@ bool CFluidMining::UnserializeFromTx(const CTransaction& tx)
 
 bool CFluidMining::UnserializeFromScript(const CScript& fluidScript)
 {
-    if (!GetFluidMiningData(fluidScript, *this)) {
+    if (!ParseScript(fluidScript, *this)) {
         return false;
     }
     return true;
diff --git a/src/fluid/mining.h b/src/fluid/mining.h
@@ -54,9 +54,6 @@ class CFluidMiningDB : public CDBWrapper
     bool RecordExists(const std::vector<unsigned char>& vchFluidScript);
 };
 
-bool GetFluidMiningData(const CScript& scriptPubKey, CFluidMining& entry);
-bool GetFluidMiningData(const CTransaction& tx, CFluidMining& entry, int& nOut);
-
 extern CFluidMiningDB* pFluidMiningDB;
 
 #endif // FLUID_MINING
diff --git a/src/fluid/mint.cpp b/src/fluid/mint.cpp
@@ -6,26 +6,22 @@
 #include "base58.h"
 #include "core_io.h"
 #include "fluid/fluid.h"
+#include "fluid/script.h"
 #include "operations.h"
 #include "script/script.h"
 
 #include <boost/thread.hpp>
 
 CFluidMintDB* pFluidMintDB = NULL;
 
-bool GetFluidMintData(const CScript& scriptPubKey, CFluidMint& entry)
-{
-    return ParseScript(scriptPubKey, entry);
-}
-
 bool GetFluidMintData(const CTransaction& tx, CFluidMint& entry, int& nOut)
 {
     int n = 0;
     for (const CTxOut& txout : tx.vout) {
         CScript txOut = txout.scriptPubKey;
-        if (IsTransactionFluid(txOut)) {
+        if (WithinFluidRange(txOut.GetFlag())) {
             nOut = n;
-            return GetFluidMintData(txOut, entry);
+            return ParseScript(txOut, entry);
         }
         n++;
     }
@@ -43,7 +39,7 @@ bool CFluidMint::UnserializeFromTx(const CTransaction& tx)
 
 bool CFluidMint::UnserializeFromScript(const CScript& fluidScript)
 {
-    if (!GetFluidMintData(fluidScript, *this)) {
+    if (!ParseScript(fluidScript, *this)) {
         return false;
     }
     return true;
diff --git a/src/fluid/mint.h b/src/fluid/mint.h
@@ -58,9 +58,6 @@ class CFluidMintDB : public CDBWrapper
     bool RecordExists(const std::vector<unsigned char>& vchFluidScript);
 };
 
-bool GetFluidMintData(const CScript& scriptPubKey, CFluidMint& entry);
-bool GetFluidMintData(const CTransaction& tx, CFluidMint& entry, int& nOut);
-
 extern CFluidMintDB* pFluidMintDB;
 
 #endif // FLUID_MINT_H
diff --git a/src/fluid/sovereign.cpp b/src/fluid/sovereign.cpp
@@ -5,26 +5,22 @@
 
 #include "core_io.h"
 #include "fluid/fluid.h"
+#include "fluid/script.h"
 #include "operations.h"
 #include "script/script.h"
 
 #include <boost/thread.hpp>
 
 CFluidSovereignDB* pFluidSovereignDB = NULL;
 
-bool GetFluidSovereignData(const CScript& scriptPubKey, CFluidSovereign& entry)
-{
-    return ParseScript(scriptPubKey, entry);
-}
-
 bool GetFluidSovereignData(const CTransaction& tx, CFluidSovereign& entry, int& nOut)
 {
     int n = 0;
     for (const CTxOut& txout : tx.vout) {
         CScript txOut = txout.scriptPubKey;
-        if (IsTransactionFluid(txOut)) {
+        if (WithinFluidRange(txOut.GetFlag())) {
             nOut = n;
-            return GetFluidSovereignData(txOut, entry);
+            return ParseScript(txOut, entry);
         }
         n++;
     }
@@ -42,7 +38,7 @@ bool CFluidSovereign::UnserializeFromTx(const CTransaction& tx)
 
 bool CFluidSovereign::UnserializeFromScript(const CScript& fluidScript)
 {
-    if (!GetFluidSovereignData(fluidScript, *this)) {
+    if (!ParseScript(fluidScript, *this)) {
         return false;
     }
     return true;
diff --git a/src/fluid/sovereign.h b/src/fluid/sovereign.h
@@ -56,8 +56,6 @@ class CFluidSovereignDB : public CDBWrapper
 private:
     void InitEmpty();
 };
-bool GetFluidSovereignData(const CScript& scriptPubKey, CFluidSovereign& entry);
-bool GetFluidSovereignData(const CTransaction& tx, CFluidSovereign& entry, int& nOut);
 
 extern CFluidSovereignDB* pFluidSovereignDB;
 
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -13,6 +13,7 @@
 #include "bdap/x509certificate.h"
 #include "consensus/consensus.h"
 #include "fluid/fluid.h"
+#include "fluid/script.h"
 #include "instantsend.h"
 #include "policy/policy.h"
 #include "privatesend.h"
@@ -70,7 +71,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet*
                     sub.type = TransactionRecord::RecvFromOther;
                     sub.address = mapValue["from"];
                 }
-                if (IsTransactionFluid(txout.scriptPubKey)) {
+                if (WithinFluidRange(txout.scriptPubKey.GetFlag())) {
                     // Fluid type
                     sub.type = TransactionRecord::Fluid;
                 }
@@ -147,7 +148,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet*
                             sub.type = TransactionRecord::PrivateSendCreateDenominations;
                             break;
                         }
-                        if (IsTransactionFluid(txout.scriptPubKey)) {
+                        if (WithinFluidRange(txout.scriptPubKey.GetFlag())) {
                             sub.type = TransactionRecord::Fluid;
                             break;
                         }
@@ -263,7 +264,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet*
                         }
                     }
                 }
-                if (IsTransactionFluid(txout.scriptPubKey)) {
+                if (WithinFluidRange(txout.scriptPubKey.GetFlag())) {
                     sub.type = TransactionRecord::Fluid;
                 } else if (mapValue["PS"] == "1") {
                     sub.type = TransactionRecord::PrivateSend;
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -33,6 +33,7 @@
 #include "fluid/dynode.h"
 #include "fluid/mining.h"
 #include "fluid/mint.h"
+#include "fluid/script.h"
 #include "hash.h"
 #include "init.h"
 #include "instantsend.h"
@@ -573,7 +574,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState& state)
         nValueOut += txout.nValue;
         if (!MoneyRange(nValueOut))
             return state.DoS(100, false, REJECT_INVALID, "bad-txns-txouttotal-toolarge");
-        if (IsTransactionFluid(txout.scriptPubKey)) {
+        if (WithinFluidRange(txout.scriptPubKey.GetFlag())) {
             if (FLUID_TRANSACTION_COST > txout.nValue)
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-fluid-vout-amount-toolow");
             if (!fluid.ValidationProcesses(state, txout.scriptPubKey, txout.nValue))
@@ -955,7 +956,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         return false;
 
     for (const CTxOut& txout : tx.vout) {
-        if (IsTransactionFluid(txout.scriptPubKey)) {
+        if (WithinFluidRange(txout.scriptPubKey.GetFlag())) {
             fluidTransaction = true;
             std::string strErrorMessage;
             // Check if fluid transaction is already in the mempool
@@ -1748,7 +1749,7 @@ bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState& state, const
         return false;
 
     BOOST_FOREACH (const CTxOut& txout, tx->vout) {
-        if (IsTransactionFluid(txout.scriptPubKey)) {
+        if (WithinFluidRange(txout.scriptPubKey.GetFlag())) {
             std::string strErrorMessage;
             if (!fluid.CheckFluidOperationScript(txout.scriptPubKey, GetTime())) {
                 fluidTimestampCheck = false;
@@ -2965,7 +2966,7 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
         const CTransaction& tx = *block.vtx[i];
         CScript scriptFluid;
         if (IsTransactionFluid(tx, scriptFluid)) {
-            int OpCode = GetFluidOpCode(scriptFluid);
+            int OpCode = scriptFluid.GetFlag();
             if (OpCode == OP_REWARD_DYNODE) {
                 CFluidDynode fluidDynode(scriptFluid);
                 fluidDynode.InitialiseHeightHash(pindex->nHeight, tx.GetHash());
@@ -4111,7 +4112,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
                 strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), state.GetDebugMessage()));
 
         for (const auto& txout : tx->vout) {
-            if (IsTransactionFluid(txout.scriptPubKey)) {
+            if (WithinFluidRange(txout.scriptPubKey.GetFlag())) {
                 std::string strErrorMessage;
                 if (!fluid.CheckFluidOperationScript(txout.scriptPubKey, block.nTime)) {
                     return error("CheckBlock(): %s, Block %s failed with %s",
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -25,6 +25,7 @@
 #include "dynode-sync.h"
 #include "fluid/fluid.h"
 #include "fluid/db.h"
+#include "fluid/script.h"
 #include "governance.h"
 #include "init.h"
 #include "instantsend.h"
@@ -4062,7 +4063,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
                 for (const auto& recipient : vecSend) {
                     CTxOut txout(recipient.nAmount, recipient.scriptPubKey);
                     
-                    if (IsTransactionFluid(recipient.scriptPubKey)) {
+                    if (WithinFluidRange(recipient.scriptPubKey.GetFlag())) {
                         // Check if fluid transaction is already in the mempool
                         if (fluid.CheckIfExistsInMemPool(mempool, recipient.scriptPubKey)) {
                             // fluid transaction is already in the mempool.  Invalid transaction.
