fix merge conflict

ethpandaops · Dec 13, 2024 · 0460c4e · 0460c4e
1 parent 76a590c
commit 0460c4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/assertoor/assertoor_launcher.star b/src/assertoor/assertoor_launcher.star
@@ -122,7 +122,7 @@ def get_config(
     IMAGE_NAME = assertoor_params.image
 
     if assertoor_params.image == constants.DEFAULT_ASSERTOOR_IMAGE:
-        if network_params.fulu_fork_epoch < constants.FULU_FORK_EPOCH:
+        if network_params.fulu_fork_epoch < constants.FAR_FUTURE_EPOCH:
             IMAGE_NAME = "ethpandaops/assertoor:fulu-support"
 
     return ServiceConfig(

diff --git a/src/dora/dora_launcher.star b/src/dora/dora_launcher.star
@@ -123,7 +123,7 @@ def get_config(
     IMAGE_NAME = dora_params.image
 
     if dora_params.image == constants.DEFAULT_DORA_IMAGE:
-        if network_params.fulu_fork_epoch < constants.FULU_FORK_EPOCH:
+        if network_params.fulu_fork_epoch < constants.FAR_FUTURE_EPOCH:
             IMAGE_NAME = "ethpandaops/dora:fulu-support"
 
     return ServiceConfig(