Merge pull request jl777#437 from VerusCoin/dev

Dev
miketout · Aug 24, 2022 · d0f18ea · d0f18ea
2 parents 26898db + 782a4b5
commit d0f18ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1712,8 +1712,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             fReindex = true;
         }
 
-        fInsightExplorer = GetBoolArg("-insightexplorer", DEFAULT_INSIGHTEXPLORER);
         pblocktree->ReadFlag("insightexplorer", checkval);
+        fInsightExplorer = GetBoolArg("-insightexplorer", checkval);
         if ( checkval != fInsightExplorer )
         {
             pblocktree->WriteFlag("insightexplorer", fInsightExplorer);
@@ -1788,7 +1788,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                 }
 
                 // Check for changed -insightexplorer state
-                if (!fReindex && fInsightExplorer != GetBoolArg("-insightexplorer", DEFAULT_INSIGHTEXPLORER) ) {
+                pblocktree->ReadFlag("insightexplorer", fInsightExplorer);
+                if (!fReindex && fInsightExplorer != GetBoolArg("-insightexplorer", fInsightExplorer) ) {
                     strLoadError = _("You need to rebuild the database using -reindex to change -insightexplorer");
                     break;
                 }

diff --git a/src/main.cpp b/src/main.cpp
@@ -7064,7 +7064,6 @@ bool static LoadBlockIndexDB()
     {
         fAddressIndex = fInsightExplorer;
         fSpentIndex = fInsightExplorer;
-        fIdIndex = fInsightExplorer;
     }
     fTimestampIndex = fInsightExplorer;
 

diff --git a/src/main.h b/src/main.h
@@ -116,7 +116,6 @@ static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60;
 //static const bool DEFAULT_SPENTINDEX = false;
 #define DEFAULT_ADDRESSINDEX (GetArg("-ac_cc",0) != 0 || GetArg("-ac_ccactivate",0) != 0)
 #define DEFAULT_SPENTINDEX (GetArg("-ac_cc",0) != 0 || GetArg("-ac_ccactivate",0) != 0)
-static const bool DEFAULT_INSIGHTEXPLORER = true;
 static const bool DEFAULT_TIMESTAMPINDEX = false;
 static const unsigned int DEFAULT_DB_MAX_OPEN_FILES = 1000;
 static const bool DEFAULT_DB_COMPRESSION = true;

diff --git a/src/pbaas/pbaas.cpp b/src/pbaas/pbaas.cpp
@@ -1883,7 +1883,6 @@ bool PrecheckCurrencyDefinition(const CTransaction &spendingTx, int32_t outNum,
 
                 bool isNFTMappedCurrency = systemDef.IsValid() &&
                                            systemDef.IsGateway() &&
-                                           systemDef.proofProtocol == systemDef.PROOF_ETHNOTARIZATION &&
                                            newCurrency.maxPreconvert.size() == 1 &&
                                            newCurrency.maxPreconvert[0] == 0 &&
                                            newCurrency.IsNFTToken() &&
@@ -1896,8 +1895,9 @@ bool PrecheckCurrencyDefinition(const CTransaction &spendingTx, int32_t outNum,
                                            newCurrency.IsToken() &&
                                            newCurrency.GetTotalPreallocation() == 1;
 
-                if (newCurrency.nativeCurrencyID.TypeNoFlags() == newCurrency.nativeCurrencyID.DEST_ETHNFT &&
-                    !isNFTMappedCurrency)
+                if ((newCurrency.nativeCurrencyID.TypeNoFlags() == newCurrency.nativeCurrencyID.DEST_ETHNFT &&
+                     !(systemDef.proofProtocol == systemDef.PROOF_ETHNOTARIZATION && isNFTMappedCurrency)) ||
+                    (newCurrency.IsNFTToken() && !isNFTMappedCurrency))
                 {
                     return state.Error("Tokenized ID currency or NFT mapped currency must have only 1 satoshi of supply and follow all definition rules");
                 }