dont consider orphans

Author: vans163

ex/lib/consensus/fabric.ex

@@ -108,9 +108,12 @@ defmodule Fabric do
     end
 
     def entries_by_height(height) do
+        softfork_deny_hash = :persistent_term.get(SoftforkDenyHash, [])
+
         %{db: db, cf: cf} = :persistent_term.get({:rocksdb, Fabric})
         RocksDB.get_prefix("#{height}:", %{db: db, cf: cf.entry_by_height})
         |> Enum.map(& Entry.unpack(entry_by_hash(elem(&1,0))))
+        |> Enum.reject(& &1.hash in softfork_deny_hash)
     end
 
     def entries_last_x(cnt) do
@@ -136,7 +139,10 @@ defmodule Fabric do
     end
 
     def consensuses_by_height(height) do
+        softfork_deny_hash = :persistent_term.get(SoftforkDenyHash, [])
+
         entries = Fabric.entries_by_height(height)
+        |> Enum.reject(& &1.hash in softfork_deny_hash)
         Enum.map(entries, fn(entry)->
             map = consensuses_by_entryhash(entry.hash) || %{}
             Enum.map(map, fn {mutations_hash, %{mask: mask, aggsig: aggsig}} ->

ex/lib/consensus/fabric_gen.ex

@@ -244,7 +244,11 @@ defmodule FabricGen do
 
     #prevent double-entries due to severe system lag (you shouldnt be validator in the first place)
     lastSlot = :persistent_term.get(:last_made_entry_slot, nil)
-    emptyHeight = Fabric.entries_by_height(next_height) == []
+
+    rooted_tip = Fabric.rooted_tip()
+    emptyHeight = Fabric.entries_by_height(next_height)
+    |> Enum.filter(& &1.header_unpacked.prev_hash == rooted_tip)
+    emptyHeight = emptyHeight == []
 
     cond do
       !FabricSyncAttestGen.isQuorumSynced() -> nil