From 907a9b172eea76ea84ac5d35f48fbcf0577ee785 Mon Sep 17 00:00:00 2001
From: Kevin Halliday <kevin@omni.network>
Date: Thu, 13 Feb 2025 17:59:56 -0500
Subject: [PATCH] chore(e2e): add solver pin to manifest (#3065)

Allow pinning solver tag in manifest.

issue: none
---
 e2e/docker/docker.go                                       | 7 ++++++-
 e2e/docker/docker_test.go                                  | 1 +
 e2e/docker/testdata/TestComposeTemplate_commit.golden      | 2 +-
 .../testdata/TestComposeTemplate_empheral_network.golden   | 2 +-
 .../TestComposeTemplate_empheral_network_upgrade.golden    | 2 +-
 e2e/types/manifest.go                                      | 5 +++++
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/e2e/docker/docker.go b/e2e/docker/docker.go
index 711806e3b..67b865be0 100644
--- a/e2e/docker/docker.go
+++ b/e2e/docker/docker.go
@@ -285,10 +285,15 @@ func SetImageTags(def ComposeDef, manifest types.Manifest, omniImgTag string) Co
 		relayerTag = manifest.PinnedRelayerTag
 	}
 
+	solverTag := omniImgTag
+	if manifest.PinnedSolverTag != "" {
+		solverTag = manifest.PinnedSolverTag
+	}
+
 	def.AnvilProxyTag = anvilProxyTag
 	def.MonitorTag = monitorTag
 	def.RelayerTag = relayerTag
-	def.SolverTag = omniImgTag
+	def.SolverTag = solverTag
 
 	return def
 }
diff --git a/e2e/docker/docker_test.go b/e2e/docker/docker_test.go
index 0f57f7159..057f2d12d 100644
--- a/e2e/docker/docker_test.go
+++ b/e2e/docker/docker_test.go
@@ -61,6 +61,7 @@ func TestComposeTemplate(t *testing.T) {
 				Manifest: types.Manifest{
 					PinnedRelayerTag: "v2",
 					PinnedMonitorTag: "v3",
+					PinnedSolverTag:  "v4",
 				},
 				Testnet: &e2e.Testnet{
 					Name:       "test",
diff --git a/e2e/docker/testdata/TestComposeTemplate_commit.golden b/e2e/docker/testdata/TestComposeTemplate_commit.golden
index 5e64a4cd9..3aae700df 100644
--- a/e2e/docker/testdata/TestComposeTemplate_commit.golden
+++ b/e2e/docker/testdata/TestComposeTemplate_commit.golden
@@ -148,7 +148,7 @@ services:
     labels:
       e2e: true
     container_name: solver
-    image: omniops/solver:7d1ae53
+    image: omniops/solver:v4
     restart: unless-stopped
     ports:
       - 26660 # Prometheus and pprof
diff --git a/e2e/docker/testdata/TestComposeTemplate_empheral_network.golden b/e2e/docker/testdata/TestComposeTemplate_empheral_network.golden
index d134a5596..62c742e6a 100644
--- a/e2e/docker/testdata/TestComposeTemplate_empheral_network.golden
+++ b/e2e/docker/testdata/TestComposeTemplate_empheral_network.golden
@@ -148,7 +148,7 @@ services:
     labels:
       e2e: true
     container_name: solver
-    image: omniops/solver:main
+    image: omniops/solver:v4
     restart: unless-stopped
     ports:
       - 26660 # Prometheus and pprof
diff --git a/e2e/docker/testdata/TestComposeTemplate_empheral_network_upgrade.golden b/e2e/docker/testdata/TestComposeTemplate_empheral_network_upgrade.golden
index 9f8d00612..dffca66ba 100644
--- a/e2e/docker/testdata/TestComposeTemplate_empheral_network_upgrade.golden
+++ b/e2e/docker/testdata/TestComposeTemplate_empheral_network_upgrade.golden
@@ -148,7 +148,7 @@ services:
     labels:
       e2e: true
     container_name: solver
-    image: omniops/solver:main
+    image: omniops/solver:v4
     restart: unless-stopped
     ports:
       - 26660 # Prometheus and pprof
diff --git a/e2e/types/manifest.go b/e2e/types/manifest.go
index 53d446e3f..c432fb9a8 100644
--- a/e2e/types/manifest.go
+++ b/e2e/types/manifest.go
@@ -121,6 +121,11 @@ type Manifest struct {
 	// This overrides the --omni-image-tag if non-empty.
 	PinnedRelayerTag string `toml:"pinned_relayer_tag"`
 
+	// PinnedSolverTag defines the pinned solver docker image tag.
+	// This allows source code defined versions for protected networks.
+	// This overrides the --omni-image-tag if non-empty.
+	PinnedSolverTag string `toml:"pinned_solver_tag"`
+
 	// EphemeralGenesis defines halovisor binary (network upgrade) to use from genesis onwards.
 	// The next network upgrade will be planned at height=1.
 	// This is only applicable to ephemeral networks.