From 054a4505ed6f11e7260a0f1fe6cb9cfb4aa8642c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 11:42:06 +0200
Subject: [PATCH 01/21] Different way of handling sync_testnets failure

---
 .github/workflows/sync-testnets.yml | 56 +++++++++++++++++------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 49df27c8c85..e83567a9d33 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -92,50 +92,56 @@ jobs:
         timeout-minutes: 180
         run: |
           set +e
-          
+      
           declare -A bad_logs
           bad_logs["Corrupt"]=1
           bad_logs["Exception"]=1
-
+      
           declare -A good_logs
           good_logs["Synced Chain Head"]=0
           good_logs["Processed"]=0
-
+      
           declare -A required_count
           required_count["Synced Chain Head"]=20
           required_count["Processed"]=20
-
+      
           counter=0
           found_bad_log=false
-
+      
           echo "Starting Docker logs monitoring..."
           docker logs -f sedge-execution-client | while read -r line; do
             echo "$line"
-
-            if $found_bad_log; then
+      
+            if [ "$found_bad_log" = true ]; then
               ((counter++))
               if [ $counter -ge 100 ]; then
                 echo "Exiting after capturing extra logs due to error."
+                echo "true" > /tmp/found_bad_log
                 exit 1
               else
                 continue
               fi
             fi
-
+      
             for bad_log in "${!bad_logs[@]}"; do
               if [[ "$line" == *"$bad_log"* ]]; then
                 echo "Error: $bad_log found in Docker logs."
                 found_bad_log=true
-                continue 2
+                echo "true" > /tmp/found_bad_log
+                break
               fi
             done
-
+      
+            if [ "$found_bad_log" = true ]; then
+              continue
+            fi
+      
             for good_log in "${!good_logs[@]}"; do
               if [[ "$line" == *"$good_log"* ]]; then
                 ((good_logs["$good_log"]++))
               fi
             done
-
+      
             # Check if all good logs have reached the required count
             all_reached_required_count=true
             for good_log in "${!good_logs[@]}"; do
@@ -144,26 +150,30 @@ jobs:
                 break
               fi
             done
-
+      
             if $all_reached_required_count; then
               echo "All required logs found."
-              exit 0
+              echo "true" > /tmp/all_reached_required_count
+              break
             fi
           done
-
+      
+          found_bad_log=false
+          all_reached_required_count=false
+      
+          if [ -f /tmp/found_bad_log ]; then
+            found_bad_log=true
+          fi
+      
+          if [ -f /tmp/all_reached_required_count ]; then
+            all_reached_required_count=true
+          fi
+      
           if $found_bad_log; then
             echo "Found bad log, exiting."
             exit 1
           fi
-
-          all_reached_required_count=true
-            for good_log in "${!good_logs[@]}"; do
-              if [[ ${good_logs[$good_log]} -lt ${required_count[$good_log]} ]]; then
-                all_reached_required_count=false
-                break
-              fi
-            done
-
+      
           if ! $all_reached_required_count; then
             echo "Not all required logs were found."
             exit 1

From ebdab79891078b91d2546f1d647fb7e92c57066b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 17:48:54 +0200
Subject: [PATCH 02/21] Change approach a little

---
 .github/workflows/sync-testnets.yml | 43 +++++++++++++----------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index e83567a9d33..ca05f088fa4 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -92,7 +92,7 @@ jobs:
         timeout-minutes: 180
         run: |
           set +e
-      
+          
           declare -A bad_logs
           bad_logs["Corrupt"]=1
           bad_logs["Exception"]=1
@@ -109,14 +109,17 @@ jobs:
           found_bad_log=false
       
           echo "Starting Docker logs monitoring..."
-          docker logs -f sedge-execution-client | while read -r line; do
+          docker logs -f sedge-execution-client > docker_logs.txt &
+          docker_pid=$!
+      
+          while IFS= read -r line; do
             echo "$line"
       
             if [ "$found_bad_log" = true ]; then
               ((counter++))
               if [ $counter -ge 100 ]; then
                 echo "Exiting after capturing extra logs due to error."
-                echo "true" > /tmp/found_bad_log
+                kill $docker_pid
                 exit 1
               else
                 continue
@@ -127,15 +130,10 @@ jobs:
               if [[ "$line" == *"$bad_log"* ]]; then
                 echo "Error: $bad_log found in Docker logs."
                 found_bad_log=true
-                echo "true" > /tmp/found_bad_log
-                break
+                continue 2
               fi
             done
       
-            if [ "$found_bad_log" = true ]; then
-              continue
-            fi
-      
             for good_log in "${!good_logs[@]}"; do
               if [[ "$line" == *"$good_log"* ]]; then
                 ((good_logs["$good_log"]++))
@@ -153,27 +151,24 @@ jobs:
       
             if $all_reached_required_count; then
               echo "All required logs found."
-              echo "true" > /tmp/all_reached_required_count
-              break
+              kill $docker_pid
+              exit 0
             fi
-          done
-      
-          found_bad_log=false
-          all_reached_required_count=false
-      
-          if [ -f /tmp/found_bad_log ]; then
-            found_bad_log=true
-          fi
-      
-          if [ -f /tmp/all_reached_required_count ]; then
-            all_reached_required_count=true
-          fi
+          done < docker_logs.txt
       
-          if $found_bad_log; then
+          if [ "$found_bad_log" = true ]; then
             echo "Found bad log, exiting."
             exit 1
           fi
       
+          all_reached_required_count=true
+          for good_log in "${!good_logs[@]}"; do
+            if [[ ${good_logs[$good_log]} -lt ${required_count[$good_log]} ]]; then
+              all_reached_required_count=false
+              break
+            fi
+          done
+      
           if ! $all_reached_required_count; then
             echo "Not all required logs were found."
             exit 1

From c07652918ef1673267d8ab92c9b2f26f96dccad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 17:52:24 +0200
Subject: [PATCH 03/21] New approach

---
 .github/workflows/sync-testnets.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index ca05f088fa4..376b57b0ad4 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -92,7 +92,7 @@ jobs:
         timeout-minutes: 180
         run: |
           set +e
-          
+      
           declare -A bad_logs
           bad_logs["Corrupt"]=1
           bad_logs["Exception"]=1
@@ -112,6 +112,8 @@ jobs:
           docker logs -f sedge-execution-client > docker_logs.txt &
           docker_pid=$!
       
+          trap "kill $docker_pid" EXIT
+      
           while IFS= read -r line; do
             echo "$line"
       
@@ -156,6 +158,8 @@ jobs:
             fi
           done < docker_logs.txt
       
+          wait $docker_pid
+      
           if [ "$found_bad_log" = true ]; then
             echo "Found bad log, exiting."
             exit 1
@@ -173,6 +177,9 @@ jobs:
             echo "Not all required logs were found."
             exit 1
           fi
+      
+          echo "All required logs were found, exiting successfully."
+          exit 0
           
       - name: Get Consensus Logs
         if: always()

From cd8f88ed57e6eed8d4d809581fc82c8baa6a240b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 18:02:34 +0200
Subject: [PATCH 04/21] Add logs output and better path

---
 .github/workflows/sync-testnets.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 376b57b0ad4..a37fcfc0207 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -108,8 +108,10 @@ jobs:
           counter=0
           found_bad_log=false
       
+          log_file="/tmp/docker_logs.txt"
+      
           echo "Starting Docker logs monitoring..."
-          docker logs -f sedge-execution-client > docker_logs.txt &
+          docker logs -f sedge-execution-client | tee $log_file &
           docker_pid=$!
       
           trap "kill $docker_pid" EXIT
@@ -156,7 +158,7 @@ jobs:
               kill $docker_pid
               exit 0
             fi
-          done < docker_logs.txt
+          done < <(tail -f $log_file)
       
           wait $docker_pid
       

From 58883307fadb387d861f36a097ff2f81ea73d1ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 18:11:08 +0200
Subject: [PATCH 05/21] fix

---
 .github/workflows/sync-testnets.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index a37fcfc0207..5594abe0b72 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -111,7 +111,7 @@ jobs:
           log_file="/tmp/docker_logs.txt"
       
           echo "Starting Docker logs monitoring..."
-          docker logs -f sedge-execution-client | tee $log_file &
+          docker logs -f sedge-execution-client > /tmp/docker_logs.txt &
           docker_pid=$!
       
           trap "kill $docker_pid" EXIT
@@ -158,7 +158,7 @@ jobs:
               kill $docker_pid
               exit 0
             fi
-          done < <(tail -f $log_file)
+          done < /tmp/docker_logs.txt
       
           wait $docker_pid
       

From cd5a37b32f146cf826a9eaf5c23c2615874ef035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 18:12:57 +0200
Subject: [PATCH 06/21] Fix2

---
 .github/workflows/sync-testnets.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 5594abe0b72..7ef2b28c231 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -111,14 +111,12 @@ jobs:
           log_file="/tmp/docker_logs.txt"
       
           echo "Starting Docker logs monitoring..."
-          docker logs -f sedge-execution-client > /tmp/docker_logs.txt &
+          docker logs -f sedge-execution-client | tee /tmp/docker_logs.txt &
           docker_pid=$!
       
           trap "kill $docker_pid" EXIT
       
           while IFS= read -r line; do
-            echo "$line"
-      
             if [ "$found_bad_log" = true ]; then
               ((counter++))
               if [ $counter -ge 100 ]; then
@@ -158,7 +156,7 @@ jobs:
               kill $docker_pid
               exit 0
             fi
-          done < /tmp/docker_logs.txt
+          done < <(tail -f /tmp/docker_logs.txt)
       
           wait $docker_pid
       

From 989c480488f306762a0249b43cdf974cd57ccb53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 18:35:14 +0200
Subject: [PATCH 07/21] test on other branch

---
 .github/workflows/sync-testnets.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 7ef2b28c231..eb8e219098b 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -21,17 +21,17 @@ jobs:
           - network: "holesky"
             checkpoint-sync-url: "https://holesky.beaconstate.ethstaker.cc/"
             cl-client: "lighthouse:sigp/lighthouse:latest"
-            el-client: "nethermind:nethermindeth/nethermind:master"
+            el-client: "nethermind:nethermindeth/nethermind:separate-block-production-and-running"
             agent: sync-agent-80gb
           - network: "chiado"
             checkpoint-sync-url: "http://139.144.26.89:4000/"
             cl-client: "lighthouse:sigp/lighthouse:latest"
-            el-client: "nethermind:nethermindeth/nethermind:master"
+            el-client: "nethermind:nethermindeth/nethermind:separate-block-production-and-running"
             agent: sync-agent-80gb
           - network: "sepolia"
             checkpoint-sync-url: "https://beaconstate-sepolia.chainsafe.io"
             cl-client: "lighthouse:sigp/lighthouse:latest"
-            el-client: "nethermind:nethermindeth/nethermind:master"
+            el-client: "nethermind:nethermindeth/nethermind:separate-block-production-and-running"
             agent: sync-agent-160gb
     name: "Run sync of ${{ matrix.network }} testnet"
     runs-on: ${{ matrix.agent }}

From ddcb2959539e0c96935cd1f52161c535d6f784c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 18:38:22 +0200
Subject: [PATCH 08/21] Temp bump extra logs

---
 .github/workflows/sync-testnets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index eb8e219098b..09b95440c19 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -119,7 +119,7 @@ jobs:
           while IFS= read -r line; do
             if [ "$found_bad_log" = true ]; then
               ((counter++))
-              if [ $counter -ge 100 ]; then
+              if [ $counter -ge 1000 ]; then
                 echo "Exiting after capturing extra logs due to error."
                 kill $docker_pid
                 exit 1

From 012b50c3b740d6d83e3435c05bc179840447d2d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 18:57:35 +0200
Subject: [PATCH 09/21] Add extra check

---
 .github/workflows/sync-testnets.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 09b95440c19..d180c4cda63 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -117,6 +117,11 @@ jobs:
           trap "kill $docker_pid" EXIT
       
           while IFS= read -r line; do
+            if ! kill -0 $docker_pid 2>/dev/null; then
+              echo "Docker process ended prematurely."
+              exit 1
+            fi
+            
             if [ "$found_bad_log" = true ]; then
               ((counter++))
               if [ $counter -ge 1000 ]; then

From c29345ecf66122514a92e9341c67ce87a320aefd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 19:01:18 +0200
Subject: [PATCH 10/21] Change approach

---
 .github/workflows/sync-testnets.yml | 38 ++++++++---------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index d180c4cda63..e9085bb499b 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -111,20 +111,23 @@ jobs:
           log_file="/tmp/docker_logs.txt"
       
           echo "Starting Docker logs monitoring..."
-          docker logs -f sedge-execution-client | tee /tmp/docker_logs.txt &
+          docker logs -f sedge-execution-client | tee "$log_file" &
           docker_pid=$!
       
           trap "kill $docker_pid" EXIT
       
           while IFS= read -r line; do
-            if ! kill -0 $docker_pid 2>/dev/null; then
-              echo "Docker process ended prematurely."
+            echo "$line"
+      
+            if [[ "$line" == *"All done, goodbye!"* ]]; then
+              echo "Unexpected termination detected: $line"
+              kill $docker_pid
               exit 1
             fi
-            
+      
             if [ "$found_bad_log" = true ]; then
               ((counter++))
-              if [ $counter -ge 1000 ]; then
+              if [ $counter -ge 100 ]; then
                 echo "Exiting after capturing extra logs due to error."
                 kill $docker_pid
                 exit 1
@@ -137,7 +140,7 @@ jobs:
               if [[ "$line" == *"$bad_log"* ]]; then
                 echo "Error: $bad_log found in Docker logs."
                 found_bad_log=true
-                continue 2
+                break
               fi
             done
       
@@ -161,30 +164,9 @@ jobs:
               kill $docker_pid
               exit 0
             fi
-          done < <(tail -f /tmp/docker_logs.txt)
+          done < <(tail -f "$log_file")
       
           wait $docker_pid
-      
-          if [ "$found_bad_log" = true ]; then
-            echo "Found bad log, exiting."
-            exit 1
-          fi
-      
-          all_reached_required_count=true
-          for good_log in "${!good_logs[@]}"; do
-            if [[ ${good_logs[$good_log]} -lt ${required_count[$good_log]} ]]; then
-              all_reached_required_count=false
-              break
-            fi
-          done
-      
-          if ! $all_reached_required_count; then
-            echo "Not all required logs were found."
-            exit 1
-          fi
-      
-          echo "All required logs were found, exiting successfully."
-          exit 0
           
       - name: Get Consensus Logs
         if: always()

From 835446f96adb3ccb0c366cb96c1cfaf633cd0381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 19:02:37 +0200
Subject: [PATCH 11/21] Update sync-testnets.yml

---
 .github/workflows/sync-testnets.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index e9085bb499b..6ab83f7dd6f 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -117,8 +117,6 @@ jobs:
           trap "kill $docker_pid" EXIT
       
           while IFS= read -r line; do
-            echo "$line"
-      
             if [[ "$line" == *"All done, goodbye!"* ]]; then
               echo "Unexpected termination detected: $line"
               kill $docker_pid
@@ -127,7 +125,7 @@ jobs:
       
             if [ "$found_bad_log" = true ]; then
               ((counter++))
-              if [ $counter -ge 100 ]; then
+              if [ $counter -ge 1000 ]; then
                 echo "Exiting after capturing extra logs due to error."
                 kill $docker_pid
                 exit 1

From a31fa4f65b7bdbbdd5675f0a6ae8578254e182c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 19:21:17 +0200
Subject: [PATCH 12/21] Update sync-testnets.yml

---
 .github/workflows/sync-testnets.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 6ab83f7dd6f..50553d70f9f 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -164,7 +164,11 @@ jobs:
             fi
           done < <(tail -f "$log_file")
       
-          wait $docker_pid
+          if [[ "$line" == *"All done, goodbye!"* ]]; then
+            echo "Unexpected termination detected2: $line"
+            kill $docker_pid
+            exit 1
+          fi
           
       - name: Get Consensus Logs
         if: always()

From 4e4c3935fba54bf51be95acebb8b466fd4d6492a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 19:27:40 +0200
Subject: [PATCH 13/21] Update sync-testnets.yml

---
 .github/workflows/sync-testnets.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 50553d70f9f..ec6054ea3b9 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -114,8 +114,6 @@ jobs:
           docker logs -f sedge-execution-client | tee "$log_file" &
           docker_pid=$!
       
-          trap "kill $docker_pid" EXIT
-      
           while IFS= read -r line; do
             if [[ "$line" == *"All done, goodbye!"* ]]; then
               echo "Unexpected termination detected: $line"

From c11e1422301bc8f8ec9090202898cb829bb23308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 19:30:44 +0200
Subject: [PATCH 14/21] Update sync-testnets.yml

---
 .github/workflows/sync-testnets.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index ec6054ea3b9..65095992df5 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -103,18 +103,13 @@ jobs:
       
           declare -A required_count
           required_count["Synced Chain Head"]=20
-          required_count["Processed"]=20
+          required_count["Processed"]=20      
       
-          counter=0
-          found_bad_log=false
-      
-          log_file="/tmp/docker_logs.txt"
-      
-          echo "Starting Docker logs monitoring..."
-          docker logs -f sedge-execution-client | tee "$log_file" &
-          docker_pid=$!
-      
-          while IFS= read -r line; do
+          docker logs -f sedge-execution-client | while read -r line; do
+          
+            counter=0
+            found_bad_log=false
+          
             if [[ "$line" == *"All done, goodbye!"* ]]; then
               echo "Unexpected termination detected: $line"
               kill $docker_pid
@@ -160,7 +155,7 @@ jobs:
               kill $docker_pid
               exit 0
             fi
-          done < <(tail -f "$log_file")
+          done
       
           if [[ "$line" == *"All done, goodbye!"* ]]; then
             echo "Unexpected termination detected2: $line"

From 104f898d9c1983f1c315cc99ba10d1d160e22984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 19:35:58 +0200
Subject: [PATCH 15/21] Update sync-testnets.yml

---
 .github/workflows/sync-testnets.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 65095992df5..bb24fc05b2c 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -106,13 +106,13 @@ jobs:
           required_count["Processed"]=20      
       
           docker logs -f sedge-execution-client | while read -r line; do
-          
+            echo "$line"
+            
             counter=0
             found_bad_log=false
           
             if [[ "$line" == *"All done, goodbye!"* ]]; then
               echo "Unexpected termination detected: $line"
-              kill $docker_pid
               exit 1
             fi
       
@@ -120,7 +120,6 @@ jobs:
               ((counter++))
               if [ $counter -ge 1000 ]; then
                 echo "Exiting after capturing extra logs due to error."
-                kill $docker_pid
                 exit 1
               else
                 continue
@@ -152,16 +151,9 @@ jobs:
       
             if $all_reached_required_count; then
               echo "All required logs found."
-              kill $docker_pid
               exit 0
             fi
           done
-      
-          if [[ "$line" == *"All done, goodbye!"* ]]; then
-            echo "Unexpected termination detected2: $line"
-            kill $docker_pid
-            exit 1
-          fi
           
       - name: Get Consensus Logs
         if: always()

From c6f3ac6c2ecadc35c078f18a2d1f5abf300005e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 19:40:51 +0200
Subject: [PATCH 16/21] Update sync-testnets.yml

---
 .github/workflows/sync-testnets.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index bb24fc05b2c..de9a21c443f 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -91,8 +91,6 @@ jobs:
         id: wait
         timeout-minutes: 180
         run: |
-          set +e
-      
           declare -A bad_logs
           bad_logs["Corrupt"]=1
           bad_logs["Exception"]=1
@@ -111,7 +109,7 @@ jobs:
             counter=0
             found_bad_log=false
           
-            if [[ "$line" == *"All done, goodbye!"* ]]; then
+            if [[ "$line" == *"All done"* ]]; then
               echo "Unexpected termination detected: $line"
               exit 1
             fi

From 89821ebcd051603f5bd413ce428069c65dc98aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 19:43:21 +0200
Subject: [PATCH 17/21] Update sync-testnets.yml

---
 .github/workflows/sync-testnets.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index de9a21c443f..d47eabd93da 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -21,17 +21,17 @@ jobs:
           - network: "holesky"
             checkpoint-sync-url: "https://holesky.beaconstate.ethstaker.cc/"
             cl-client: "lighthouse:sigp/lighthouse:latest"
-            el-client: "nethermind:nethermindeth/nethermind:separate-block-production-and-running"
+            el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "chiado"
             checkpoint-sync-url: "http://139.144.26.89:4000/"
             cl-client: "lighthouse:sigp/lighthouse:latest"
-            el-client: "nethermind:nethermindeth/nethermind:separate-block-production-and-running"
+            el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "sepolia"
             checkpoint-sync-url: "https://beaconstate-sepolia.chainsafe.io"
             cl-client: "lighthouse:sigp/lighthouse:latest"
-            el-client: "nethermind:nethermindeth/nethermind:separate-block-production-and-running"
+            el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-160gb
     name: "Run sync of ${{ matrix.network }} testnet"
     runs-on: ${{ matrix.agent }}
@@ -116,7 +116,7 @@ jobs:
       
             if [ "$found_bad_log" = true ]; then
               ((counter++))
-              if [ $counter -ge 1000 ]; then
+              if [ $counter -ge 100 ]; then
                 echo "Exiting after capturing extra logs due to error."
                 exit 1
               else

From 26c34a8c3ad5ebcef95e3261d1ab931f70b8ed68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 21:09:02 +0200
Subject: [PATCH 18/21] Adjust

---
 .github/workflows/sync-testnets.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index d47eabd93da..b16c41c0de4 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -102,12 +102,12 @@ jobs:
           declare -A required_count
           required_count["Synced Chain Head"]=20
           required_count["Processed"]=20      
+            
+          counter=0
+          found_bad_log=false
       
           docker logs -f sedge-execution-client | while read -r line; do
             echo "$line"
-            
-            counter=0
-            found_bad_log=false
           
             if [[ "$line" == *"All done"* ]]; then
               echo "Unexpected termination detected: $line"
@@ -115,7 +115,7 @@ jobs:
             fi
       
             if [ "$found_bad_log" = true ]; then
-              ((counter++))
+              counter=$((counter + 1))
               if [ $counter -ge 100 ]; then
                 echo "Exiting after capturing extra logs due to error."
                 exit 1
@@ -134,7 +134,7 @@ jobs:
       
             for good_log in "${!good_logs[@]}"; do
               if [[ "$line" == *"$good_log"* ]]; then
-                ((good_logs["$good_log"]++))
+                good_logs["$good_log"]=$((good_logs["$good_log"]+1))
               fi
             done
       

From e626a235bb6b2d665fc971597c6f27da6fcddff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 21:47:24 +0200
Subject: [PATCH 19/21] Change to nimbus

---
 .github/workflows/sync-testnets.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index b16c41c0de4..1405eccaf65 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -20,17 +20,17 @@ jobs:
         include:
           - network: "holesky"
             checkpoint-sync-url: "https://holesky.beaconstate.ethstaker.cc/"
-            cl-client: "lighthouse:sigp/lighthouse:latest"
+            cl-client: "nimbus:statusim/nimbus-eth2:amd64-latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "chiado"
             checkpoint-sync-url: "http://139.144.26.89:4000/"
-            cl-client: "lighthouse:sigp/lighthouse:latest"
+            cl-client: "nimbus:statusim/nimbus-eth2:amd64-latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "sepolia"
             checkpoint-sync-url: "https://beaconstate-sepolia.chainsafe.io"
-            cl-client: "lighthouse:sigp/lighthouse:latest"
+            cl-client: "nimbus:statusim/nimbus-eth2:amd64-latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-160gb
     name: "Run sync of ${{ matrix.network }} testnet"
@@ -41,15 +41,6 @@ jobs:
         with:
           clean: true
 
-      - name: Configure settings
-        id: settings
-        run: |
-          echo "BUILD_TIMESTAMP=$(date '+%s')" >> $GITHUB_OUTPUT
-          echo "COMMIT_HASH=$(git describe --always --exclude=* --abbrev=40)" >> $GITHUB_OUTPUT
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
       - name: Installing requirements
         run: |
           sudo apt-get update

From 38652b1f4b677c9459f2d783cc59aa0f4c506f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 21:49:21 +0200
Subject: [PATCH 20/21] Switch to prysm

---
 .github/workflows/sync-testnets.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 1405eccaf65..0f13d3d5c46 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -20,17 +20,17 @@ jobs:
         include:
           - network: "holesky"
             checkpoint-sync-url: "https://holesky.beaconstate.ethstaker.cc/"
-            cl-client: "nimbus:statusim/nimbus-eth2:amd64-latest"
+            cl-client: "prysm:prysmaticlabs/prysm-beacon-chain:stable"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "chiado"
             checkpoint-sync-url: "http://139.144.26.89:4000/"
-            cl-client: "nimbus:statusim/nimbus-eth2:amd64-latest"
+            cl-client: "prysm:prysmaticlabs/prysm-beacon-chain:stable"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "sepolia"
             checkpoint-sync-url: "https://beaconstate-sepolia.chainsafe.io"
-            cl-client: "nimbus:statusim/nimbus-eth2:amd64-latest"
+            cl-client: "prysm:prysmaticlabs/prysm-beacon-chain:stable"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-160gb
     name: "Run sync of ${{ matrix.network }} testnet"

From a99e3c204e707d0754b4284f02bff559b44869f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Chodo=C5=82a?=
 <43241881+kamilchodola@users.noreply.github.com>
Date: Thu, 16 May 2024 21:51:05 +0200
Subject: [PATCH 21/21] Switch to lodestar

---
 .github/workflows/sync-testnets.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sync-testnets.yml b/.github/workflows/sync-testnets.yml
index 0f13d3d5c46..3a5b0bdfcdf 100644
--- a/.github/workflows/sync-testnets.yml
+++ b/.github/workflows/sync-testnets.yml
@@ -20,17 +20,17 @@ jobs:
         include:
           - network: "holesky"
             checkpoint-sync-url: "https://holesky.beaconstate.ethstaker.cc/"
-            cl-client: "prysm:prysmaticlabs/prysm-beacon-chain:stable"
+            cl-client: "lodestar:chainsafe/lodestar:latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "chiado"
             checkpoint-sync-url: "http://139.144.26.89:4000/"
-            cl-client: "prysm:prysmaticlabs/prysm-beacon-chain:stable"
+            cl-client: "lodestar:chainsafe/lodestar:latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-80gb
           - network: "sepolia"
             checkpoint-sync-url: "https://beaconstate-sepolia.chainsafe.io"
-            cl-client: "prysm:prysmaticlabs/prysm-beacon-chain:stable"
+            cl-client: "lodestar:chainsafe/lodestar:latest"
             el-client: "nethermind:nethermindeth/nethermind:master"
             agent: sync-agent-160gb
     name: "Run sync of ${{ matrix.network }} testnet"