Merge remote-tracking branch 'origin/compatible' into lyh/compat-into-dev-nov17-2025

Author: glyh

buildkite/scripts/check-compatibility.sh

@@ -76,43 +76,43 @@ function to_dhall_list() {
   echo "$dhall_list"
 }
 
-if [[ -z "$CODENAMES" ]]; then
+if [[ -z "${CODENAMES:-}" ]]; then
   usage "CODENAMES environment variable is required"
 fi
 
-if [[ -z "$NETWORK" ]]; then
+if [[ -z "${NETWORK:-}" ]]; then
   usage "NETWORK environment variable is required"
 fi
 
-if [[ -z "$CONFIG_JSON_GZ_URL" ]]; then
+if [[ -z "${CONFIG_JSON_GZ_URL:-}" ]]; then
   usage "CONFIG_JSON_GZ_URL environment variable is required"
 fi
 
 # Format GENESIS_TIMESTAMP as Optional Text for Dhall
-if [[ -z "$GENESIS_TIMESTAMP" ]]; then
+if [[ -z "${GENESIS_TIMESTAMP:-}" ]]; then
   GENESIS_TIMESTAMP="None Text"
 else
   # shellcheck disable=SC2089
   GENESIS_TIMESTAMP="(Some \"${GENESIS_TIMESTAMP}\")"
 fi
 
 # Format VERSION as Optional Text for Dhall
-if [[ -z "$VERSION" ]]; then
+if [[ -z "${VERSION:-}" ]]; then
   VERSION="(None Text)"
 else
   # shellcheck disable=SC2089
   VERSION="(Some \"${VERSION}\")"
 fi
 
 # Format PRECOMPUTED_FORK_BLOCK_PREFIX as Optional Text for Dhall
-if [[ -z "$PRECOMPUTED_FORK_BLOCK_PREFIX" ]]; then
+if [[ -z "${PRECOMPUTED_FORK_BLOCK_PREFIX:-}" ]]; then
   PRECOMPUTED_FORK_BLOCK_PREFIX="(None Text)"
 else
   # shellcheck disable=SC2089
   PRECOMPUTED_FORK_BLOCK_PREFIX="(Some \"${PRECOMPUTED_FORK_BLOCK_PREFIX}\")"
 fi
 
-DHALL_CODENAMES=$(to_dhall_list "$CODENAMES" "$DEBIAN_VERSION_DHALL_DEF.DebVersion")
+DHALL_CODENAMES=$(to_dhall_list "${CODENAMES:-}" "$DEBIAN_VERSION_DHALL_DEF.DebVersion")
 
 # shellcheck disable=SC2089
 printf '%s.generate_hardfork_package %s %s.Type.%s %s "%s" "%s" %s %s\n' \

buildkite/scripts/entrypoints/run-hardfork-package-gen.sh

@@ -19,8 +19,10 @@ in  { step =
                     [ "ARCHIVE_TEST_APP=mina-archive-node-test"
                     , "MINA_TEST_NETWORK_DATA=/etc/mina/test/archive/sample_db"
                     ]
-                    ( RunWithPostgres.ScriptOrArchive.Script
-                        "src/test/archive/sample_db/archive_db.sql"
+                    ( Some
+                        ( RunWithPostgres.ScriptOrArchive.Script
+                            "src/test/archive/sample_db/archive_db.sql"
+                        )
                     )
                     ( Artifacts.fullDockerTag
                         Artifacts.Tag::{

buildkite/src/Command/ArchiveNodeTest.dhall

@@ -19,8 +19,10 @@ in  { step =
                     [ "PATCH_ARCHIVE_TEST_APP=mina-patch-archive-test"
                     , "NETWORK_DATA_FOLDER=/etc/mina/test/archive/sample_db"
                     ]
-                    ( RunWithPostgres.ScriptOrArchive.Script
-                        "./src/test/archive/sample_db/archive_db.sql"
+                    ( Some
+                        ( RunWithPostgres.ScriptOrArchive.Script
+                            "./src/test/archive/sample_db/archive_db.sql"
+                        )
                     )
                     ( Artifacts.fullDockerTag
                         Artifacts.Tag::{

buildkite/src/Command/PatchArchiveTest.dhall

@@ -17,8 +17,10 @@ in  { step =
               , commands =
                 [ RunWithPostgres.runInDockerWithPostgresConn
                     ([] : List Text)
-                    ( RunWithPostgres.ScriptOrArchive.Script
-                        "./src/test/archive/sample_db/archive_db.sql"
+                    ( Some
+                        ( RunWithPostgres.ScriptOrArchive.Script
+                            "./src/test/archive/sample_db/archive_db.sql"
+                        )
                     )
                     ( Artifacts.fullDockerTag
                         Artifacts.Tag::{

buildkite/src/Command/ReplayerTest.dhall

@@ -12,7 +12,7 @@ for database-dependent operations.
 
 **Parameters:**
 - `environment : List Text` - Additional environment variables to pass to the container
-- `initScript : Text` - Path to SQL initialization script to run against the database
+- `initScript : Optional ScriptOrArchive` - Optional database initialization. Either a script path or an archive + script selector.
 - `docker : Text` - Docker image name to run the main command in
 - `innerScript : Text` - Script or command to execute inside the Docker container
 
@@ -46,7 +46,6 @@ for database-dependent operations.
 - `PG_CONN` - Full database connection string
 -}
 
-
 let Prelude = ../External/Prelude.dhall
 
 let P = Prelude
@@ -62,9 +61,9 @@ let ScriptOrArchive
     = < Script : Text | Archive : { Script : Text, Archive : Text } >
 
 let runInDockerWithPostgresConn
-    : List Text -> ScriptOrArchive -> Text -> Text -> Cmd.Type
+    : List Text -> Optional ScriptOrArchive -> Text -> Text -> Cmd.Type
     =     \(environment : List Text)
-      ->  \(initScript : ScriptOrArchive)
+      ->  \(initScript : Optional ScriptOrArchive)
       ->  \(docker : Text)
       ->  \(innerScript : Text)
       ->  let port = "5432"
@@ -103,15 +102,23 @@ let runInDockerWithPostgresConn
 
           let runInitScript =
                 merge
-                  { Script =
-                          \(script : Text)
-                      ->  [ "docker exec ${postgresDockerName} psql ${pg_conn} -f /workdir/${script}"
-                          ]
-                  , Archive =
-                          \(archive : { Script : Text, Archive : Text })
-                      ->  [ "tar -xzf ${archive.Archive}"
-                          , "docker exec ${postgresDockerName} find /workdir -name \"${archive.Script}\" -exec psql ${pg_conn} -f {} \\;"
-                          ]
+                  { Some =
+                          \(script : ScriptOrArchive)
+                      ->  merge
+                            { Script =
+                                    \(s : Text)
+                                ->  [ "docker exec ${postgresDockerName} psql ${pg_conn} -f /workdir/${s}"
+                                    ]
+                            , Archive =
+                                    \ ( archive
+                                      : { Script : Text, Archive : Text }
+                                      )
+                                ->  [ "tar -xzf ${archive.Archive}"
+                                    , "docker exec ${postgresDockerName} find /workdir -name \"${archive.Script}\" -exec psql ${pg_conn} -f {} \\;"
+                                    ]
+                            }
+                            script
+                  , None = [] : List Text
                   }
                   initScript