fix(test-suite): tighten release lock and kms rc compat

Author: Eikix

.github/workflows/test-suite-orchestrate-e2e-tests.yml

@@ -64,12 +64,16 @@ jobs:
           set -euo pipefail
           artifact_name="fhevm-base-lock-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
           lock_path="$RUNNER_TEMP/release-base-lock.json"
+          profile_path="$RUNNER_TEMP/latest-supported.json"
           base_short_tag="${BASE_SHA:0:7}"
-          git show "${BASE_SHA}:test-suite/fhevm/profiles/latest-supported.json" | BASE_SHORT_TAG="$base_short_tag" LOCK_PATH="$lock_path" python3 - <<'PY'
+          git show "${BASE_SHA}:test-suite/fhevm/profiles/latest-supported.json" > "$profile_path"
+          BASE_SHORT_TAG="$base_short_tag" LOCK_PATH="$lock_path" python3 - "$profile_path" <<'PY'
           import json
           import os
+          import sys
 
-          bundle = json.load(__import__("sys").stdin)
+          with open(sys.argv[1], encoding="utf8") as fh:
+              bundle = json.load(fh)
           base_short_tag = os.environ["BASE_SHORT_TAG"]
           bundle["target"] = "latest-supported"
           bundle["lockName"] = f"release-base-{base_short_tag}.json"

test-suite/fhevm/src/compat.test.ts

@@ -6,6 +6,7 @@ import {
   MODERN_RELAYER_IMAGE_REPOSITORY,
   MODERN_RELAYER_MIGRATE_IMAGE_REPOSITORY,
   compatPolicyForState,
+  requiresLegacyKmsCoreConfig,
   requiresLegacyRelayerUrl,
   validateBundleCompatibility,
 } from "./compat/compat";
@@ -71,6 +72,19 @@ describe("compat", () => {
     ).toBe(true);
   });
 
+  test("treats kms-core v0.13.10 prereleases as modern config schema", () => {
+    expect(
+      requiresLegacyKmsCoreConfig({
+        versions: {
+          target: "sha",
+          lockName: "sha.json",
+          env: { CORE_VERSION: "v0.13.10-rc.3" } as Record<string, string>,
+          sources: [],
+        },
+      }),
+    ).toBe(false);
+  });
+
   test("renders legacy pauser flags for old contract tags", () => {
     const policy = compatPolicyForState({
       versions: {

test-suite/fhevm/src/compat/compat.ts

@@ -111,6 +111,11 @@ const parseCompatVersion = (version: string) => {
 
 const usesModernRelayerRepository = (version: string) => !parseCompatVersion(version);
 
+const sameCompatBase = (version: string, target: CompatSemver) => {
+  const parsed = parseCompatVersion(version);
+  return !!parsed && parsed.parts.every((part, index) => part === target[index]);
+};
+
 export const relayerImageRepository = (version: string) =>
   usesModernRelayerRepository(version) ? MODERN_RELAYER_IMAGE_REPOSITORY : LEGACY_RELAYER_IMAGE_REPOSITORY;
 
@@ -159,7 +164,8 @@ export const requiresLegacyRelayerReadinessConfig = (state: Pick<CompatState, "v
 
 /** Detects when kms-core still expects the legacy config schema. */
 export const requiresLegacyKmsCoreConfig = (state: Pick<CompatState, "versions">) =>
-  versionLt(state.versions.env.CORE_VERSION ?? "", [0, 13, 10]);
+  versionLt(state.versions.env.CORE_VERSION ?? "", [0, 13, 10]) &&
+  !sameCompatBase(state.versions.env.CORE_VERSION ?? "", [0, 13, 10]);
 
 /** Detects when test-suite should use the legacy relayer base URL. */
 export const requiresLegacyRelayerUrl = (state: Pick<CompatState, "versions">) =>