ext tor

IOCoin · Dec 18, 2017 · 3a723c6 · 3a723c6
1 parent 800ded8
commit 3a723c6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/src/dions.cpp b/src/dions.cpp
@@ -6133,6 +6133,26 @@ ConnectInputsPost(map<uint256, CTxIndex>& mapTestPool,
                                CBlockIndex* pindexBlock, CDiskTxPos& txPos,
                                bool fBlock, bool fMiner)
 {
+    if(tx.nVersion != CTransaction::DION_TX_VERSION)
+    {
+        bool found= false;
+        for(int i = 0; i < tx.vout.size(); i++)
+        {
+            const CTxOut& out = tx.vout[i];
+
+            std::vector<vchType> vvchRead;
+            int opRead;
+
+            if(aliasScript(out.scriptPubKey, opRead, vvchRead))
+                found=true;
+        }
+
+        if(found)
+            return error("ConnectInputsPost() : a non-dions transaction with a dions input");
+        return true;
+    }
+
+
     LocatorNodeDB ln1Db("r+");
     int nInput;
     bool found = false;
@@ -6158,25 +6178,6 @@ ConnectInputsPost(map<uint256, CTxIndex>& mapTestPool,
         vvchPrevArgs = vvchPrevArgsRead;
       }
     }
-    if(tx.nVersion != CTransaction::DION_TX_VERSION)
-    {
-
-        bool found= false;
-        for(int i = 0; i < tx.vout.size(); i++)
-        {
-            const CTxOut& out = tx.vout[i];
-
-            std::vector<vchType> vvchRead;
-            int opRead;
-
-            if(aliasScript(out.scriptPubKey, opRead, vvchRead))
-                found=true;
-        }
-
-        if(found)
-            return error("ConnectInputsPost() : a non-dions transaction with a dions input");
-        return true;
-    }
 
     std::vector<vchType> vvchArgs;
     int op;

diff --git a/src/main.cpp b/src/main.cpp
@@ -2456,8 +2456,6 @@ bool CBlock::AcceptBlock()
     map<uint256, CTxIndex> mapQueuedChanges;
     BOOST_FOREACH(CTransaction& tx, vtx)
     {
-
-
         MapPrevTx mapInputs;
         if (!tx.IsCoinBase())
         {
@@ -2531,8 +2529,11 @@ bool CBlock::AcceptBlock()
     unsigned int nBlockPos = 0;
     if (!WriteToDisk(nFile, nBlockPos))
         return error("AcceptBlock() : WriteToDisk failed");
+
     if (!AddToBlockIndex(nFile, nBlockPos, hashProof))
-        return error("AcceptBlock() : AddToBlockIndex failed");
+    {
+        return error("add : failed");
+    }
 
     // Relay inventory, but don't relay old inventory during initial block download
     int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate();