Merge branch 'develop' into feat/index-backward-let

Author: Stefan-Ethernal

.github/test_e2e_cdk_erigon_args_base.json

@@ -17,7 +17,7 @@
     "agglayer_prover_primary_prover": "mock-prover",
     "zkevm_use_real_verifier": false,
     "sp1_prover_key": "",
-    "sequencer_type": "erigon",
+    "sequencer_type": "cdk-erigon",
     "cdk_erigon_image": "europe-west2-docker.pkg.dev/prj-polygonlabs-devtools-dev/public/cdk-erigon:v2.65.0-RC1",
     "enable_normalcy": true,
     "erigon_strict_mode": false,

.github/workflows/test-e2e.yml

@@ -54,7 +54,7 @@ jobs:
             fi
           else
             # For push/workflow_dispatch, use the fixed commit
-            COMMIT="b959a5f2b7e8247ae09e16fd9f51c1e23a1ab5ee"
+            COMMIT="8ad1a72ccf5212219cabc67e0d7f542658295185"
             echo "Using fixed kurtosis-cdk commit: ${COMMIT}"
           fi
           echo "commit=${COMMIT}" >> $GITHUB_OUTPUT
@@ -176,11 +176,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@dda31eec4cece42d896fa5f05f706c017ed0a572
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@4224e63054f65108bf0539a33bbb918d670f8841
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: dda31eec4cece42d896fa5f05f706c017ed0a572 # main
+      agglayer-e2e-ref: 4224e63054f65108bf0539a33bbb918d670f8841 # main
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-pessimistic }}
       test-name: "test-single-l2-network-op-pessimistic"
@@ -204,11 +204,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@dda31eec4cece42d896fa5f05f706c017ed0a572
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@4224e63054f65108bf0539a33bbb918d670f8841
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: dda31eec4cece42d896fa5f05f706c017ed0a572 # main
+      agglayer-e2e-ref: 4224e63054f65108bf0539a33bbb918d670f8841 # main
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-succinct }}
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
@@ -232,12 +232,12 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@dda31eec4cece42d896fa5f05f706c017ed0a572
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-single-chain.yml@4224e63054f65108bf0539a33bbb918d670f8841
     if: always() && github.event_name == 'schedule' && github.ref == 'refs/heads/develop'
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: dda31eec4cece42d896fa5f05f706c017ed0a572 # main
+      agglayer-e2e-ref: 4224e63054f65108bf0539a33bbb918d670f8841 # main
       kurtosis-cdk-enclave-name: op
       kurtosis-cdk-args: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-single-op-succinct-aggoracle-committee }}
       test-name: "test-single-l2-network-op-succinct-aggoracle-committee"
@@ -261,11 +261,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@dda31eec4cece42d896fa5f05f706c017ed0a572
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@4224e63054f65108bf0539a33bbb918d670f8841
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: dda31eec4cece42d896fa5f05f706c017ed0a572 # main
+      agglayer-e2e-ref: 4224e63054f65108bf0539a33bbb918d670f8841 # main
       kurtosis-cdk-enclave-name: op
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       kurtosis-cdk-args-1: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-1 }}
@@ -287,11 +287,11 @@ jobs:
       - build-tools
       - read-aggkit-args
       - get-kurtosis-cdk-commit
-    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@dda31eec4cece42d896fa5f05f706c017ed0a572
+    uses: agglayer/e2e/.github/workflows/aggkit-e2e-multi-chains.yml@4224e63054f65108bf0539a33bbb918d670f8841
     secrets: inherit
     with:
       kurtosis-cdk-ref: ${{ needs.get-kurtosis-cdk-commit.outputs.kurtosis-commit }}
-      agglayer-e2e-ref: dda31eec4cece42d896fa5f05f706c017ed0a572 # main
+      agglayer-e2e-ref: 4224e63054f65108bf0539a33bbb918d670f8841 # main
       kurtosis-cdk-enclave-name: aggkit
       aggsender-find-imported-bridge-artifact: aggsender_find_imported_bridge
       kurtosis-cdk-args-1: ${{ needs.read-aggkit-args.outputs.kurtosis-cdk-args-3 }}

common/errors.go

@@ -2,21 +2,30 @@ package common
 
 import (
 	"regexp"
-	"strings"
 )
 
 const maxRangeMatchGroups = 2
 
-var re = regexp.MustCompile(`max range:\s*(\d+)`)
+var (
+	// Matches "block range too large, max range: 1000"
+	reMaxRange = regexp.MustCompile(`block range too large, max range:\s*(\d+)`)
+	// Matches "exceeded maximum block range: 5000"
+	reExceededBlockRange = regexp.MustCompile(`exceeded maximum block range:\s*(\d+)`)
+)
 
 // ParseMaxRangeFromError extracts the max range value from error message
-// Expected format: "block range too large, max range: 1000"
+// Expected formats:
+//   - "block range too large, max range: 1000"
+//   - "exceeded maximum block range: 5000"
 func ParseMaxRangeFromError(errMsg string) (uint64, bool) {
-	if !strings.Contains(errMsg, "block range too large") {
-		return 0, false
+	var matches []string
+	for _, re := range []*regexp.Regexp{reMaxRange, reExceededBlockRange} {
+		matches = re.FindStringSubmatch(errMsg)
+		if len(matches) >= maxRangeMatchGroups {
+			break
+		}
 	}
 
-	matches := re.FindStringSubmatch(errMsg)
 	if len(matches) < maxRangeMatchGroups {
 		return 0, false
 	}

common/errors_test.go

@@ -63,6 +63,24 @@ func TestParseMaxRangeFromError(t *testing.T) {
 			expectedMaxBlock:   0,
 			expectedIsMaxRange: false,
 		},
+		{
+			name:               "exceeded maximum block range format",
+			errorMsg:           "exceeded maximum block range: 5000",
+			expectedMaxBlock:   5000,
+			expectedIsMaxRange: true,
+		},
+		{
+			name:               "exceeded maximum block range with no spaces",
+			errorMsg:           "exceeded maximum block range:1000",
+			expectedMaxBlock:   1000,
+			expectedIsMaxRange: true,
+		},
+		{
+			name:               "exceeded maximum block range with extra spaces",
+			errorMsg:           "exceeded maximum block range:   2500",
+			expectedMaxBlock:   2500,
+			expectedIsMaxRange: true,
+		},
 	}
 
 	for _, tt := range tests {