Merge pull request #15959 from MinaProtocol/fix/network-id-develop

Fix/network id develop
MinaProtocol · Aug 29, 2024 · 79f6a40 · 79f6a40
2 parents 48888b0 + e81e748
commit 79f6a40
Show file tree

Hide file tree

Showing 21 changed files with 277 additions and 92 deletions.
diff --git a/buildkite/src/Command/DockerImage.dhall b/buildkite/src/Command/DockerImage.dhall
@@ -10,6 +10,8 @@ let Size = ./Size.dhall
 
 let Profiles = ../Constants/Profiles.dhall
 
+let Artifacts = ../Constants/Artifacts.dhall
+
 let BuildFlags = ../Constants/BuildFlags.dhall
 
 let Cmd = ../Lib/Cmds.dhall
@@ -42,7 +44,7 @@ let ReleaseSpec =
           { deps = [] : List Command.TaggedKey.Type
           , network = "${Network.lowerName Network.Type.Devnet}"
           , version = "\\\${MINA_DOCKER_TAG}"
-          , service = "\\\${MINA_SERVICE}"
+          , service = Artifacts.dockerName Artifacts.Type.Daemon
           , branch = "\\\${BUILDKITE_BRANCH}"
           , repo = "\\\${BUILDKITE_REPO}"
           , deb_codename = "bullseye"
@@ -66,8 +68,8 @@ let generateStep =
           let buildDockerCmd =
                     "./scripts/docker/build.sh"
                 ++  " --service ${spec.service}"
-                ++  " --version ${spec.version}"
                 ++  " --network ${spec.network}"
+                ++  " --version ${spec.version}"
                 ++  " --branch ${spec.branch}"
                 ++  " ${maybeCacheOption} "
                 ++  " --deb-codename ${spec.deb_codename}"

diff --git a/buildkite/src/Command/HardforkPackageGeneration.dhall b/buildkite/src/Command/HardforkPackageGeneration.dhall
@@ -30,6 +30,8 @@ let DebianVersions = ../Constants/DebianVersions.dhall
 
 let DebianRepo = ../Constants/DebianRepo.dhall
 
+let Artifacts = ../Constants/Artifacts.dhall
+
 let Profiles = ../Constants/Profiles.dhall
 
 let Toolchain = ../Constants/Toolchain.dhall
@@ -157,7 +159,7 @@ let pipeline
                     DockerImage.ReleaseSpec::{
                     , deps =
                       [ { name = pipelineName, key = generateLedgersJobKey } ]
-                    , service = "mina-daemon"
+                    , service = Artifacts.dockerName Artifacts.Type.Daemon
                     , network = network_name
                     , deb_codename = "${DebianVersions.lowerName debVersion}"
                     , deb_profile = profile
@@ -212,7 +214,7 @@ let pipeline
                     DockerImage.ReleaseSpec::{
                     , deps =
                       [ { name = pipelineName, key = generateLedgersJobKey } ]
-                    , service = "mina-archive"
+                    , service = Artifacts.dockerName Artifacts.Type.Archive
                     , network = network_name
                     , deb_codename = "${DebianVersions.lowerName debVersion}"
                     , deb_profile = profile
@@ -226,7 +228,7 @@ let pipeline
                     DockerImage.ReleaseSpec::{
                     , deps =
                       [ { name = pipelineName, key = generateLedgersJobKey } ]
-                    , service = "mina-rosetta"
+                    , service = Artifacts.dockerName Artifacts.Type.Rosetta
                     , network = network_name
                     , deb_repo = DebianRepo.Type.Local
                     , deb_codename = "${DebianVersions.lowerName debVersion}"

diff --git a/buildkite/src/Command/MinaArtifact.dhall b/buildkite/src/Command/MinaArtifact.dhall
@@ -105,36 +105,6 @@ let build_artifacts
               ]
             }
 
-let publish_to_debian_repo =
-          \(spec : MinaBuildSpec.Type)
-      ->  Command.build
-            Command.Config::{
-            , commands =
-                Toolchain.select
-                  spec.toolchainSelectMode
-                  spec.debVersion
-                  [ "AWS_ACCESS_KEY_ID"
-                  , "AWS_SECRET_ACCESS_KEY"
-                  , "MINA_DEB_CODENAME=${DebianVersions.lowerName
-                                           spec.debVersion}"
-                  , "MINA_DEB_RELEASE=${DebianChannel.lowerName spec.channel}"
-                  ]
-                  "./buildkite/scripts/debian/publish.sh"
-            , label =
-                "Publish Mina for ${DebianVersions.capitalName
-                                      spec.debVersion} ${Profiles.toSuffixUppercase
-                                                           spec.profile}"
-            , key = "publish-deb-pkg"
-            , depends_on =
-                DebianVersions.dependsOnStep
-                  (Some spec.prefix)
-                  spec.debVersion
-                  spec.profile
-                  spec.buildFlags
-                  "build"
-            , target = Size.Small
-            }
-
 let docker_step
     : Artifacts.Type -> MinaBuildSpec.Type -> List DockerImage.ReleaseSpec.Type
     =     \(artifact : Artifacts.Type)
@@ -157,7 +127,8 @@ let docker_step
                       (     \(n : Network.Type)
                         ->  DockerImage.ReleaseSpec::{
                             , deps = deps
-                            , service = "mina-daemon"
+                            , service =
+                                Artifacts.dockerName Artifacts.Type.Daemon
                             , network = Network.lowerName n
                             , deb_codename =
                                 "${DebianVersions.lowerName spec.debVersion}"
@@ -178,8 +149,8 @@ let docker_step
                 , BatchTxn =
                   [ DockerImage.ReleaseSpec::{
                     , deps = deps
-                    , service = "mina-batch-txn"
-                    , network = "${Network.lowerName Network.Type.Devnet}"
+                    , service = Artifacts.dockerName Artifacts.Type.BatchTxn
+                    , network = Network.lowerName Network.Type.Devnet
                     , deb_codename =
                         "${DebianVersions.lowerName spec.debVersion}"
                     , deb_profile = spec.profile
@@ -188,13 +159,13 @@ let docker_step
                     , step_key =
                         "batch-txn-${DebianVersions.lowerName
                                        spec.debVersion}${BuildFlags.toLabelSegment
-                                                           spec.buildFlags}--docker-image"
+                                                           spec.buildFlags}-docker-image"
                     }
                   ]
                 , Archive =
                   [ DockerImage.ReleaseSpec::{
                     , deps = deps
-                    , service = "mina-archive"
+                    , service = Artifacts.dockerName Artifacts.Type.Archive
                     , deb_codename =
                         "${DebianVersions.lowerName spec.debVersion}"
                     , deb_profile = spec.profile
@@ -208,25 +179,32 @@ let docker_step
                     }
                   ]
                 , Rosetta =
-                  [ DockerImage.ReleaseSpec::{
-                    , deps = deps
-                    , service = "mina-rosetta"
-                    , network = "${Network.lowerName Network.Type.Devnet}"
-                    , build_flags = spec.buildFlags
-                    , deb_repo = DebianRepo.Type.Local
-                    , deb_profile = spec.profile
-                    , deb_codename =
-                        "${DebianVersions.lowerName spec.debVersion}"
-                    , step_key =
-                        "rosetta-${DebianVersions.lowerName
-                                     spec.debVersion}${BuildFlags.toLabelSegment
-                                                         spec.buildFlags}-docker-image"
-                    }
-                  ]
+                    Prelude.List.map
+                      Network.Type
+                      DockerImage.ReleaseSpec.Type
+                      (     \(n : Network.Type)
+                        ->  DockerImage.ReleaseSpec::{
+                            , deps = deps
+                            , service =
+                                Artifacts.dockerName Artifacts.Type.Rosetta
+                            , network = Network.lowerName n
+                            , deb_codename =
+                                "${DebianVersions.lowerName spec.debVersion}"
+                            , deb_profile = spec.profile
+                            , deb_repo = DebianRepo.Type.Local
+                            , step_key =
+                                "rosetta-${Network.lowerName
+                                             n}-${DebianVersions.lowerName
+                                                    spec.debVersion}${Profiles.toLabelSegment
+                                                                        spec.profile}-docker-image"
+                            }
+                      )
+                      spec.networks
                 , ZkappTestTransaction =
                   [ DockerImage.ReleaseSpec::{
                     , deps = deps
-                    , service = "mina-zkapp-test-transaction"
+                    , service =
+                        Artifacts.dockerName Artifacts.Type.ZkappTestTransaction
                     , build_flags = spec.buildFlags
                     , deb_repo = DebianRepo.Type.Local
                     , deb_profile = spec.profile
@@ -236,13 +214,15 @@ let docker_step
                         "zkapp-test-transaction-${DebianVersions.lowerName
                                                     spec.debVersion}${Profiles.toLabelSegment
                                                                         spec.profile}${BuildFlags.toLabelSegment
-                                                                                         spec.buildFlags}--docker-image"
+                                                                                         spec.buildFlags}-docker-image"
                     }
                   ]
                 , FunctionalTestSuite =
                   [ DockerImage.ReleaseSpec::{
                     , deps = deps
-                    , service = "mina-test-suite"
+                    , service =
+                        Artifacts.dockerName Artifacts.Type.FunctionalTestSuite
+                    , network = Network.lowerName Network.Type.Devnet
                     , deb_codename =
                         "${DebianVersions.lowerName spec.debVersion}"
                     , build_flags = spec.buildFlags
@@ -252,8 +232,7 @@ let docker_step
                         "test-suite-${DebianVersions.lowerName
                                         spec.debVersion}${Profiles.toLabelSegment
                                                             spec.profile}${BuildFlags.toLabelSegment
-                                                                             spec.buildFlags}--docker-image"
-                    , network = "${Network.lowerName Network.Type.Devnet}"
+                                                                             spec.buildFlags}-docker-image"
                     }
                   ]
                 }
@@ -288,6 +267,36 @@ let docker_commands
                 )
                 flattened_docker_steps
 
+let publish_to_debian_repo =
+          \(spec : MinaBuildSpec.Type)
+      ->  Command.build
+            Command.Config::{
+            , commands =
+                Toolchain.select
+                  spec.toolchainSelectMode
+                  spec.debVersion
+                  [ "AWS_ACCESS_KEY_ID"
+                  , "AWS_SECRET_ACCESS_KEY"
+                  , "MINA_DEB_CODENAME=${DebianVersions.lowerName
+                                           spec.debVersion}"
+                  , "MINA_DEB_RELEASE=${DebianChannel.lowerName spec.channel}"
+                  ]
+                  "./buildkite/scripts/debian/publish.sh"
+            , label =
+                "Publish Mina for ${DebianVersions.capitalName
+                                      spec.debVersion} ${Profiles.toSuffixUppercase
+                                                           spec.profile}"
+            , key = "publish-deb-pkg"
+            , depends_on =
+                DebianVersions.dependsOnStep
+                  (Some spec.prefix)
+                  spec.debVersion
+                  spec.profile
+                  spec.buildFlags
+                  "build"
+            , target = Size.Small
+            }
+
 let pipelineBuilder
     : MinaBuildSpec.Type -> List Command.Type -> Pipeline.Config.Type
     =     \(spec : MinaBuildSpec.Type)

diff --git a/buildkite/src/Command/ReplayerTest.dhall b/buildkite/src/Command/ReplayerTest.dhall
@@ -6,6 +6,8 @@ let Size = ./Size.dhall
 
 let RunWithPostgres = ./RunWithPostgres.dhall
 
+let Network = ../Constants/Network.dhall
+
 in  { step =
             \(dependsOn : List Command.TaggedKey.Type)
         ->  Command.build
@@ -15,6 +17,7 @@ in  { step =
                     ([] : List Text)
                     "./src/test/archive/sample_db/archive_db.sql"
                     Artifacts.Type.Archive
+                    (None Network.Type)
                     "./buildkite/scripts/replayer-test.sh"
                 ]
               , label = "Archive: Replayer test"

diff --git a/buildkite/src/Command/RunWithPostgres.dhall b/buildkite/src/Command/RunWithPostgres.dhall
@@ -2,6 +2,10 @@ let Prelude = ../External/Prelude.dhall
 
 let P = Prelude
 
+let Optional/map = Prelude.Optional.map
+
+let Optional/default = Prelude.Optional.default
+
 let Text/concatMap = P.Text.concatMap
 
 let Cmd = ../Lib/Cmds.dhall
@@ -10,11 +14,19 @@ let ContainerImages = ../Constants/ContainerImages.dhall
 
 let Artifacts = ../Constants/Artifacts.dhall
 
+let Network = ../Constants/Network.dhall
+
 let runInDockerWithPostgresConn
-    : List Text -> Text -> Artifacts.Type -> Text -> Cmd.Type
+    :     List Text
+      ->  Text
+      ->  Artifacts.Type
+      ->  Optional Network.Type
+      ->  Text
+      ->  Cmd.Type
     =     \(environment : List Text)
       ->  \(initScript : Text)
       ->  \(docker : Artifacts.Type)
+      ->  \(network : Optional Network.Type)
       ->  \(innerScript : Text)
       ->  let port = "5432"
 
@@ -28,6 +40,15 @@ let runInDockerWithPostgresConn
 
           let dbName = "archive"
 
+          let maybeNetwork =
+                Optional/map
+                  Network.Type
+                  Text
+                  (\(network : Network.Type) -> "-${Network.lowerName network}")
+                  network
+
+          let networkOrDefault = Optional/default Text "" maybeNetwork
+
           let pg_conn =
                 "postgres://${user}:${password}@localhost:${port}/${dbName}"
 
@@ -46,7 +67,7 @@ let runInDockerWithPostgresConn
 
           let outerDir
               : Text
-              = "\\\$BUILDKITE_BUILD_CHECKOUT_PATH"
+              = "\\\$BUILDKITE_BUILD_CHECKOUT_PATH${networkOrDefault}"
 
           let minaDockerTag
               : Text

diff --git a/buildkite/src/Constants/Artifacts.dhall b/buildkite/src/Constants/Artifacts.dhall
@@ -161,7 +161,8 @@ let dockerTag =
                 , LogProc = "${version_and_codename}"
                 , TestExecutive = "${version_and_codename}"
                 , BatchTxn = "${version_and_codename}"
-                , Rosetta = "${version_and_codename}"
+                , Rosetta =
+                    "${version_and_codename}-${Network.lowerName network}"
                 , ZkappTestTransaction = "${version_and_codename}"
                 , FunctionalTestSuite = "${version_and_codename}"
                 }