chore: remove vanilla upgrade

.github/workflows/ci.yml

@@ -213,47 +213,6 @@ jobs:
         run: |
           make test-e2e-cache-btc-staking
 
-  e2e-run-upgrade-vanilla:
-    needs: [e2e-docker-build-babylon, e2e-docker-build-babylon-before-upgrade, e2e-docker-build-e2e-init-chain]
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Download babylon artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: babylond-${{ github.sha }}
-          path: /tmp
-      - name: Download babylond-before-upgrade artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: babylond-before-upgrade
-          path: /tmp
-      - name: Download init-chain artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: init-chain
-          path: /tmp
-      - name: Docker load babylond
-        run: |
-          docker load < /tmp/docker-babylond.tar.gz
-
-      - name: Docker load babylond-before-upgrade
-        run: |
-          docker load < /tmp/docker-babylond-before-upgrade.tar.gz
-
-      - name: Docker load init chain
-        run: |
-          docker load < /tmp/docker-init-chain.tar.gz
-
-      - name: Cache Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.21
-      - name: Run e2e TestSoftwareUpgradeTestSuite
-        run: |
-          sudo make test-e2e-cache-upgrade-vanilla
-
   e2e-run-upgrade-signet:
     needs: [e2e-docker-build-babylon, e2e-docker-build-babylon-before-upgrade, e2e-docker-build-e2e-init-chain]
     runs-on: ubuntu-22.04

Makefile

@@ -274,9 +274,6 @@ test-e2e-cache-btc-timestamping-phase-2-rly:
 test-e2e-cache-btc-staking:
 	go test -run TestBTCStakingTestSuite -mod=readonly -timeout=60m -v $(PACKAGES_E2E) --tags=e2e
 
-test-e2e-cache-upgrade-vanilla:
-	go test -run TestSoftwareUpgradeTestSuite -mod=readonly -timeout=60m -v $(PACKAGES_E2E) --tags=e2e
-
 test-e2e-cache-upgrade-signet:
 	go test -run TestSoftwareUpgradeSignetLaunchTestSuite -mod=readonly -timeout=60m -v $(PACKAGES_E2E) --tags=e2e
 

app/e2e_include_upgrades.go

@@ -4,9 +4,8 @@ package app
 
 import (
 	"github.com/babylonlabs-io/babylon/app/upgrades/signetlaunch"
-	"github.com/babylonlabs-io/babylon/app/upgrades/vanilla"
 )
 
 func init() {
-	Upgrades = append(Upgrades, vanilla.Upgrade, signetlaunch.Upgrade)
+	Upgrades = append(Upgrades, signetlaunch.Upgrade)
 }

contrib/images/Makefile

@@ -1,6 +1,6 @@
 RELAYER_TAG := $(shell grep '^ENV RELAYER_TAG' cosmos-relayer/Dockerfile | cut -f3 -d\ )
 BABYLON_FULL_PATH := $(shell git rev-parse --show-toplevel)
-BABYLON_VERSION_BEFORE_UPGRADE ?= v0.9.0
+BABYLON_VERSION_BEFORE_UPGRADE ?= v0.9.1
 
 all: babylond cosmos-relayer
 

test/e2e/configurer/config/constants.go

@@ -16,6 +16,5 @@ const (
 	// PropSubmitBlocks estimated number of blocks it takes to submit for a proposal
 	PropSubmitBlocks float32 = 1
 	// Upgrade prop files json
-	UpgradeVanillaFilePath      = "/upgrades/vanilla.json"
 	UpgradeSignetLaunchFilePath = "/upgrades/signet-launch.json"
 )

test/e2e/e2e_test.go

@@ -36,11 +36,6 @@ func TestBTCStakingTestSuite(t *testing.T) {
 	suite.Run(t, new(BTCStakingTestSuite))
 }
 
-// TestSoftwareUpgradeTestSuite tests software upgrade protocol end-to-end
-func TestSoftwareUpgradeTestSuite(t *testing.T) {
-	suite.Run(t, new(SoftwareUpgradeVanillaTestSuite))
-}
-
 // TestSoftwareUpgradeSignetLaunchTestSuite tests software upgrade of signet launch end-to-end
 func TestSoftwareUpgradeSignetLaunchTestSuite(t *testing.T) {
 	suite.Run(t, new(SoftwareUpgradeSignetLaunchTestSuite))