Merge branch 'dev' into jl777

2018-09-05 20:36:25 -11:00
parent c16a5d4be1 374897c90e
commit 1fcb0c4e4c
9 changed files with 70 additions and 76 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1552,14 +1552,17 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
            KOMODO_ON_DEMAND++;
        pool.addUnchecked(hash, entry, !IsInitialBlockDownload());

-        // Add memory address index
-        if (fAddressIndex) {
-            pool.addAddressIndex(entry, view);
-        }
+        if (!tx.IsCoinImport())
+        {
+            // Add memory address index
+            if (fAddressIndex) {
+                pool.addAddressIndex(entry, view);
+            }

-        // Add memory spent index
-        if (fSpentIndex) {
-            pool.addSpentIndex(entry, view);
+            // Add memory spent index
+            if (fSpentIndex) {
+                pool.addSpentIndex(entry, view);
+            }
        }
    }