feat(uniond): added v0.12.0 migration (#694)

* feat(uniond): added v0.12.0 migration * feat(unionvisor): added mkNextBundle and bundle-testnet-next
unionlabs · Sep 13, 2023 · 09a7285 · 09a7285
1 parent 1bc0497
commit 09a7285
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 2 deletions.
diff --git a/e2e/all-tests.nix b/e2e/all-tests.nix
@@ -3,7 +3,7 @@
     (lib.flip withSystem ({ e2e, networks, pkgs, nixpkgs, crane, self', ... }:
       let
         epoch-staking = import ./epoch-staking.nix { inherit e2e pkgs; };
-        upgrades = import ./upgrades.nix { inherit e2e pkgs; unionvisor = self'.packages.unionvisor; bundle = self'.packages.bundle-testnet; };
+        upgrades = import ./upgrades.nix { inherit e2e pkgs; unionvisor = self'.packages.unionvisor; bundle = self'.packages.bundle-testnet-next; };
       in
       {
         ensure-blocks = import ./ensure-blocks/ensure-blocks.nix { inherit e2e networks pkgs nixpkgs crane; };

diff --git a/e2e/upgrades.nix b/e2e/upgrades.nix
@@ -47,6 +47,7 @@ in
       ${upgradeTo "v0.9.0" 10}
       ${upgradeTo "v0.10.0" 20}
       ${upgradeTo "v0.11.0" 30}
+      ${upgradeTo "v0.12.0" 40}
     '';
 
     nodes = {

diff --git a/uniond/app/upgrades.go b/uniond/app/upgrades.go
@@ -5,12 +5,13 @@ import (
 	"union/app/upgrades"
 	"union/app/upgrades/v0_10_0"
 	"union/app/upgrades/v0_11_0"
+	"union/app/upgrades/v0_12_0"
 	"union/app/upgrades/v0_9_0"
 
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
-var Upgrades = []upgrades.Upgrade{v0_9_0.Upgrade, v0_10_0.Upgrade, v0_11_0.Upgrade}
+var Upgrades = []upgrades.Upgrade{v0_9_0.Upgrade, v0_10_0.Upgrade, v0_11_0.Upgrade, v0_12_0.Upgrade}
 
 // configure store loader that checks if version == upgradeHeight and applies store upgrades
 func (app *UnionApp) setupUpgradeStoreLoaders() {

diff --git a/uniond/app/upgrades/v0_12_0/constants.go b/uniond/app/upgrades/v0_12_0/constants.go
@@ -0,0 +1,14 @@
+package v0_12_0
+
+import (
+	store "github.com/cosmos/cosmos-sdk/store/types"
+	"union/app/upgrades"
+)
+
+const UpgradeName = "v0.12.0"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{Added: []string{}},
+}
diff --git a/uniond/app/upgrades/v0_12_0/upgrades.go b/uniond/app/upgrades/v0_12_0/upgrades.go
@@ -0,0 +1,15 @@
+package v0_12_0
+
+import (
+	"union/app/upgrades"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator, keepers *upgrades.AppKeepers) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}
diff --git a/unionvisor/unionvisor.nix b/unionvisor/unionvisor.nix
@@ -41,6 +41,27 @@
             path = pkgs.lib.getExe (get-flake "${inputs."${swapDotsWithUnderscores version}"}").packages.${system}.uniond;
           })
           versions);
+      mkNextBundle = name: versions: nextVersion: meta:
+        pkgs.linkFarm "union-bundle-${name}" ([
+          {
+            name = "meta.json";
+            path = pkgs.writeText "meta.json" (builtins.toJSON meta);
+          }
+          {
+            name = "unionvisor";
+            path = "${unionvisorAll.packages.unionvisor}/bin/unionvisor";
+          }
+          {
+            name = "${meta.versions_directory}/${nextVersion}/${meta.binary_name}";
+            path = pkgs.lib.getExe self'.packages.uniond;
+          }
+        ] ++ map
+          (version: {
+            name =
+              "${meta.versions_directory}/${version}/${meta.binary_name}";
+            path = pkgs.lib.getExe (get-flake "${inputs."${swapDotsWithUnderscores version}"}").packages.${system}.uniond;
+          })
+          versions);
     in
     {
       inherit (unionvisorAll) checks;
@@ -52,6 +73,12 @@
             versions_directory = "versions";
             fallback_version = "v0.8.0";
           };
+        bundle-testnet-next =
+          mkNextBundle "testnet" [ "v0.8.0" "v0.9.0" "v0.10.0" "v0.11.0" ] "v0.12.0" {
+            binary_name = "uniond";
+            versions_directory = "versions";
+            fallback_version = "v0.8.0";
+          };
       };
     };