Merge pull request #757 from evoskuil/master

Integrate compact filtering.

Author: evoskuil

src/chasers/chaser_confirm.cpp

@@ -184,7 +184,19 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
         }
         else if (is_under_checkpoint(height) || query.is_milestone(link))
         {
+            // Dont update position until this block is filtered.
+            if (!query.is_filtereable(link))
+                return;
+
+            if (!query.set_filter_head(link))
+            {
+                fault(error::confirm9);
+                return;
+            }
+
             // Fall through (report confirmed).
+            if (query.filter_enabled())
+                fire(events::tx_validated, height);
         }
         else if (ec == database::error::unvalidated)
         {
@@ -222,6 +234,18 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
                 return;
             }
 
+            // Set before changing block state.
+            if (query.set_filter_head(link))
+            {
+                if (query.filter_enabled())
+                    fire(events::tx_validated, height);
+            }
+            else
+            {
+                fault(error::confirm9);
+                return;
+            }
+
             // Otherwise we will reconfirm entire chain on restart.
             if (!query.set_block_confirmable(link))
             {
@@ -258,12 +282,6 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
             return;
         }
 
-        ////if (!query.set_filter_head(link))
-        ////{
-        ////    fault(error::confirm9);
-        ////    return;
-        ////}
-
         if (!set_organized(link, height))
         {
             fault(error::confirm10);

src/chasers/chaser_validate.cpp

@@ -227,10 +227,16 @@ void chaser_validate::validate_block(const header_link& link,
         if (!query.set_block_unconfirmable(link))
             ec = error::validate4;
     }
-    ////else if (!query.set_filter_body(link, *block))
-    ////{
-    ////    ec = error::validate5;
-    ////}
+    else if (query.set_filter_body(link, *block))
+    {
+        if (query.filter_enabled())
+            fire(events::tx_archived, ctx.height);
+    }
+    else
+    {
+        ec = error::validate5;
+    }
+
 
     backlog_.fetch_sub(one, std::memory_order_relaxed);