fix validator grabbing invalid txs

Author: vans163

ex/lib/consensus/fabric_gen.ex

@@ -50,7 +50,7 @@ defmodule FabricGen do
 
   def tick_slot(state) do
     #IO.inspect "tick_slot"
-    Application.fetch_env!(:ama, :testnet) && Process.sleep(500)
+    Application.fetch_env!(:ama, :testnet) && Process.sleep(350)
 
     if proc_if_my_slot() do
       proc_entries()
@@ -206,6 +206,7 @@ defmodule FabricGen do
     lastSlot = :persistent_term.get(:last_made_entry_slot, nil)
 
     rooted_tip = DB.Chain.rooted_tip()
+
     emptyHeight = DB.Entry.by_height(next_height)
     emptyHeight = emptyHeight == []
 

ex/lib/consensus/models/tx.ex

@@ -58,6 +58,8 @@ defmodule TX do
 
    def validate(txu, is_special_meeting_block \\ false) do
     try do
+      true = !txu[:tx_encoded]
+
       txu = Map.take(txu, @fields)
       tx_encoded = RDB.vecpak_encode(txu.tx)
 

ex/lib/node/txpool.ex

@@ -111,15 +111,21 @@ defmodule TXPool do
             segment_vr_hash = DB.Chain.segment_vr_hash()
             {acc, state} = :ets.foldl(fn({key, txu}, {acc, state_old})->
                 try do
-                  case validate_tx(txu, %{epoch: chain_epoch, segment_vr_hash: segment_vr_hash, batch_state: state_old}) do
-                    %{error: :ok, batch_state: batch_state} ->
-                      acc = acc ++ [txu]
-                      if length(acc) == amt do
-                          throw {:choose, acc}
+                  case TX.validate(txu) do
+                    %{error: :ok} ->
+                      case validate_tx(txu, %{epoch: chain_epoch, segment_vr_hash: segment_vr_hash, batch_state: state_old}) do
+                        %{error: :ok, batch_state: batch_state} ->
+                          acc = acc ++ [txu]
+                          if length(acc) == amt do
+                              throw {:choose, acc}
+                          end
+                          {acc, batch_state}
+                        #delete stale
+                        %{key: key} ->
+                          :ets.delete(TXPool, key)
+                          {acc, state_old}
                       end
-                      {acc, batch_state}
-                    #delete stale
-                    %{key: key} ->
+                    _ ->
                       :ets.delete(TXPool, key)
                       {acc, state_old}
                   end