chore: bump spectest version to v1.4.0-beta.7-hotfix (#774)

Author: MegaRedHand

.spectest_version

@@ -1 +1 @@
-v1.4.0-alpha.0
+v1.4.0-beta.7-hotfix

config/networks/minimal/config.yaml

@@ -78,8 +78,7 @@ INACTIVITY_SCORE_RECOVERY_RATE: 16
 # 2**4 * 10**9 (= 16,000,000,000) Gwei
 EJECTION_BALANCE: 16000000000
 # [customized] more easily demonstrate the difference between this value and the activation churn limit
-# TODO: 1. update code to latest spec; 2. bump spectest version; 3. update this value
-MIN_PER_EPOCH_CHURN_LIMIT: 4 # 2
+MIN_PER_EPOCH_CHURN_LIMIT: 2
 # [customized] scale queue churn at much lower validator counts for testing
 CHURN_LIMIT_QUOTIENT: 32
 # [New in Deneb:EIP7514] [customized]

lib/lambda_ethereum_consensus/fork_choice/handlers.ex

@@ -182,10 +182,14 @@ defmodule LambdaEthereumConsensus.ForkChoice.Handlers do
       # Add new block and state to the store
       BlockStates.store_state(block_root, state)
 
+      is_first_block = store.proposer_boost_root == <<0::256>>
+      # TODO: store block timeliness data?
+      is_timely = Store.get_current_slot(store) == block.slot and is_before_attesting_interval
+
       store
       |> Store.store_block(block_root, signed_block)
       |> if_then_update(
-        is_before_attesting_interval and Store.get_current_slot(store) == block.slot,
+        is_timely and is_first_block,
         &%Store{&1 | proposer_boost_root: block_root}
       )
       # Update checkpoints in store if necessary
@@ -254,7 +258,7 @@ defmodule LambdaEthereumConsensus.ForkChoice.Handlers do
   def compute_pulled_up_tip(%Store{} = store, block_root, block, state) do
     with {:ok, state} <- EpochProcessing.process_justification_and_finalization(state) do
       block_epoch = Misc.compute_epoch_at_slot(block.slot)
-      current_epoch = store |> Store.get_current_slot() |> Misc.compute_epoch_at_slot()
+      current_epoch = Store.get_current_epoch(store)
 
       unrealized_justifications =
         Map.put(store.unrealized_justifications, block_root, state.current_justified_checkpoint)
@@ -355,7 +359,7 @@ defmodule LambdaEthereumConsensus.ForkChoice.Handlers do
     target = attestation.data.target
 
     # Attestations must be from the current or previous epoch
-    current_epoch = store |> Store.get_current_slot() |> Misc.compute_epoch_at_slot()
+    current_epoch = Store.get_current_epoch(store)
     # Use GENESIS_EPOCH for previous when genesis to avoid underflow
     previous_epoch = max(current_epoch - 1, Constants.genesis_epoch())
 

lib/lambda_ethereum_consensus/fork_choice/helpers.ex

@@ -117,13 +117,14 @@ defmodule LambdaEthereumConsensus.ForkChoice.Helpers do
   end
 
   defp filter_leaf_block(%Store{} = store, block_root, block, blocks) do
-    current_epoch = store |> Store.get_current_slot() |> Misc.compute_epoch_at_slot()
+    current_epoch = Store.get_current_epoch(store)
     voting_source = get_voting_source(store, block_root)
 
     # The voting source should be at the same height as the store's justified checkpoint
     correct_justified =
       store.justified_checkpoint.epoch == Constants.genesis_epoch() or
-        voting_source.epoch == store.justified_checkpoint.epoch
+        voting_source.epoch == store.justified_checkpoint.epoch or
+        voting_source.epoch + 2 >= current_epoch
 
     # If the previous epoch is justified, the block should be pulled-up. In this case, check that unrealized
     # justification is higher than the store and that the voting source is not more than two epochs ago
@@ -158,7 +159,7 @@ defmodule LambdaEthereumConsensus.ForkChoice.Helpers do
   # Compute the voting source checkpoint in event that block with root ``block_root`` is the head block
   def get_voting_source(%Store{} = store, block_root) do
     block = Blocks.get_block!(block_root)
-    current_epoch = store |> Store.get_current_slot() |> Misc.compute_epoch_at_slot()
+    current_epoch = Store.get_current_epoch(store)
     block_epoch = Misc.compute_epoch_at_slot(block.slot)
 
     if current_epoch > block_epoch do
@@ -172,8 +173,7 @@ defmodule LambdaEthereumConsensus.ForkChoice.Helpers do
   end
 
   def previous_epoch_justified?(%Store{} = store) do
-    current_slot = Store.get_current_slot(store)
-    current_epoch = Misc.compute_epoch_at_slot(current_slot)
+    current_epoch = Store.get_current_epoch(store)
     store.justified_checkpoint.epoch + 1 == current_epoch
   end
 

lib/lambda_ethereum_consensus/state_transition/math.ex

@@ -3,10 +3,15 @@ defmodule LambdaEthereumConsensus.StateTransition.Math do
   Math functions
   """
 
+  @uint64_max 2 ** 64 - 1
+  @uint32_max 2 ** 32 - 1
+
   @doc """
   Return the largest integer ``x`` such that ``x**2 <= n``.
   """
   @spec integer_squareroot(Types.uint64()) :: Types.uint64()
+  def integer_squareroot(@uint64_max), do: @uint32_max
+
   def integer_squareroot(n) when is_integer(n) do
     compute_root(n, n, div(n + 1, 2))
   end

lib/types/store.ex

@@ -92,6 +92,10 @@ defmodule Types.Store do
     div(time - genesis_time, ChainSpec.get("SECONDS_PER_SLOT"))
   end
 
+  def get_current_epoch(store) do
+    store |> get_current_slot() |> Misc.compute_epoch_at_slot()
+  end
+
   def get_ancestor(%__MODULE__{} = store, root, slot) do
     block = Blocks.get_block!(root)