disconnect notarisations

src/cc/eval.cpp

@@ -201,7 +201,6 @@ bool ParseNotarisationOpReturn(const CTransaction &tx, NotarisationData &data)
 /*
  * Misc
  */
-
 std::string EvalToStr(EvalCode c)
 {
     FOREACH_EVAL(EVAL_GENERATE_STRING);

src/main.cpp

@@ -2483,6 +2483,13 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
         }
     }
 
+    // Delete from notarisations cache
+    NotarisationsInBlock nibs;
+    if (GetBlockNotarisations(block.GetHash(), nibs)) {
+        pnotarisations->Erase(block.GetHash());
+        EraseBackNotarisations(nibs);
+    }
+
     // set the old best anchor back
     view.PopAnchor(blockUndo.old_tree_root);
     
@@ -2502,6 +2509,7 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
             return AbortNode(state, "Failed to write address unspent index");
         }
     }
+
     return fClean;
 }
 
@@ -2836,13 +2844,12 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         pos.nTxOffset += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);
     }
 
-
     // Record Notarisations
     NotarisationsInBlock notarisations = GetNotarisationsInBlock(block, pindex->nHeight);
-    pnotarisations->Write(block.GetHash(), notarisations);
+    if (notarisations.size() > 0) {
-    WriteBackNotarisations(notarisations);  // Very important to disconnect this
+        pnotarisations->Write(block.GetHash(), notarisations);
-    // TODO: Disconnect?
+        WriteBackNotarisations(notarisations);
-    
+    }
     
     view.PushAnchor(tree);
     if (!fJustCheck) {

src/notarisationdb.cpp

@@ -47,11 +47,21 @@ bool GetBackNotarisation(uint256 notarisationHash, Notarisation &n)
 /*
  * Write an index of KMD notarisation id -> backnotarisation
  */
-void WriteBackNotarisations(NotarisationsInBlock notarisations)
+void WriteBackNotarisations(const NotarisationsInBlock notarisations)
 {
-    BOOST_FOREACH(Notarisation &n, notarisations)
+    BOOST_FOREACH(const Notarisation &n, notarisations)
     {
-        if (n.second.IsBackNotarisation)
+        if (!n.second.txHash.IsNull())
             pnotarisations->Write(n.second.txHash, n);
     }
 }
+
+
+void EraseBackNotarisations(const NotarisationsInBlock notarisations)
+{
+    BOOST_FOREACH(const Notarisation &n, notarisations)
+    {
+        if (!n.second.txHash.IsNull())
+            pnotarisations->Erase(n.second.txHash);
+    }
+}

src/notarisationdb.h

@@ -21,6 +21,7 @@ typedef std::vector<Notarisation> NotarisationsInBlock;
 NotarisationsInBlock GetNotarisationsInBlock(const CBlock &block, int nHeight);
 bool GetBlockNotarisations(uint256 blockHash, NotarisationsInBlock &nibs);
 bool GetBackNotarisation(uint256 notarisationHash, Notarisation &n);
-void WriteBackNotarisations(NotarisationsInBlock notarisations);
+void WriteBackNotarisations(const NotarisationsInBlock notarisations);
+void EraseBackNotarisations(const NotarisationsInBlock notarisations);
 
 #endif  /* NOTARISATIONDB_H */