From 1253a9d54a2204676dd4a5986928736000d6b1cf Mon Sep 17 00:00:00 2001
From: Matee ullah Malik <mateeullahmalik@hotmail.com>
Date: Mon, 27 Apr 2026 13:39:21 +0000
Subject: [PATCH] test(devnet): re-inject --sequence on mismatch in everlight
 retry loop

The everlight test's run_tx_with_retry helper retried up to 3x with sleep 2
on 'account sequence mismatch' but never reseeded the sequence. lumerad
kept reading the stale local sequence cache, so every retry hit the same
expected/got delta. Under load (S2's report churn -> S3.1's first big tx)
this manifested as a hard fail instead of recovering.

Fix:
  - Parse expected sequence from raw_log
  - Strip any prior --sequence flag and re-inject --sequence N
  - Bump retries 3 -> 5, sleep 2 -> 3 (still epoch-safe)

Test-only change. No chain or supernode behavior modified.

Verified locally on master devnet: PASS:35 FAIL:0 SKIP:4 EXIT=0.
---
 devnet/tests/everlight/everlight_test.sh | 31 ++++++++++++++++++++----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/devnet/tests/everlight/everlight_test.sh b/devnet/tests/everlight/everlight_test.sh
index 73c23f99..0f977a0c 100755
--- a/devnet/tests/everlight/everlight_test.sh
+++ b/devnet/tests/everlight/everlight_test.sh
@@ -151,16 +151,37 @@ is_sequence_mismatch() {
 run_tx_with_retry() {
     local service="$1"
     shift
-    local attempt result
+    local attempt result raw_log expected_seq
+    local -a args=("$@")
 
-    for attempt in 1 2 3; do
-        result="$(lumerad_tx_service "$service" "$@")" || true
+    for attempt in 1 2 3 4 5; do
+        result="$(lumerad_tx_service "$service" "${args[@]}")" || true
         if ! is_sequence_mismatch "$result"; then
             echo "$result"
             return 0
         fi
-        echo "    WARN: sequence mismatch on $service tx attempt $attempt, retrying..." >&2
-        sleep 2
+        # Extract the expected sequence from the raw_log so the next attempt
+        # bypasses the stale local sequence cache. Cosmos SDK message format:
+        # "account sequence mismatch, expected N, got M: incorrect account sequence"
+        raw_log="$(echo "$result" | jq -r '.raw_log // empty' 2>/dev/null)"
+        expected_seq="$(echo "$raw_log" | grep -oE 'expected [0-9]+' | head -1 | awk '{print $2}')"
+        echo "    WARN: sequence mismatch on $service tx attempt $attempt (expected=${expected_seq:-?}), retrying..." >&2
+        if [[ -n "$expected_seq" ]] && [[ "$expected_seq" =~ ^[0-9]+$ ]]; then
+            # Drop any prior --sequence flag (with or without =) before re-injecting.
+            local -a filtered=() i=0
+            while (( i < ${#args[@]} )); do
+                if [[ "${args[$i]}" == "--sequence" ]]; then
+                    i=$((i + 2)); continue
+                fi
+                if [[ "${args[$i]}" == --sequence=* ]]; then
+                    i=$((i + 1)); continue
+                fi
+                filtered+=("${args[$i]}")
+                i=$((i + 1))
+            done
+            args=("${filtered[@]}" "--sequence" "$expected_seq")
+        fi
+        sleep 3
     done
 
     echo "$result"