merge

lavanet · Oct 13, 2024 · 1a13384 · 1a13384
2 parents 5c2eda8 + 4394756
commit 1a13384
Show file tree

Hide file tree

Showing 144 changed files with 6,325 additions and 2,528 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,14 +12,14 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Install Go
         uses: actions/setup-go@v5
         with:
           go-version: 1.20.5
 
-      - name: Checkout code
-        uses: actions/checkout@v4
-
       - name: Lint
         uses: golangci/golangci-lint-action@v4
         with:

diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
@@ -23,15 +23,15 @@ jobs:
   #       with:
   #         input: "proto"
 
-  break-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: bufbuild/[email protected]
-      - uses: bufbuild/buf-breaking-action@v1
-        with:
-          input: "proto"
-          against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"
+  # break-check:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: bufbuild/[email protected]
+  #     - uses: bufbuild/buf-breaking-action@v1
+  #       with:
+  #         input: "proto"
+  #         against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"
 
   validate-check:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Publish Lava Release
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+(-[a-zA-Z0-9]+)?'
   workflow_dispatch:
     inputs:
       release_tag:

diff --git a/app/app.go b/app/app.go
@@ -166,42 +166,6 @@ const (
 
 // Upgrades add here future upgrades (upgrades.Upgrade)
 var Upgrades = []upgrades.Upgrade{
-	upgrades.Upgrade_0_22_0,
-	upgrades.Upgrade_0_23_0,
-	upgrades.Upgrade_0_23_2,
-	upgrades.Upgrade_0_23_4,
-	upgrades.Upgrade_0_23_5,
-	upgrades.Upgrade_0_24_0,
-	upgrades.Upgrade_0_25_0,
-	upgrades.Upgrade_0_25_1,
-	upgrades.Upgrade_0_25_2,
-	upgrades.Upgrade_0_26_0,
-	upgrades.Upgrade_0_26_1,
-	upgrades.Upgrade_0_26_2,
-	upgrades.Upgrade_0_27_0,
-	upgrades.Upgrade_0_30_0,
-	upgrades.Upgrade_0_30_1,
-	upgrades.Upgrade_0_30_2,
-	upgrades.Upgrade_0_31_0,
-	upgrades.Upgrade_0_31_1,
-	upgrades.Upgrade_0_32_0,
-	upgrades.Upgrade_0_32_3,
-	upgrades.Upgrade_0_33_0,
-	upgrades.Upgrade_0_34_0,
-	upgrades.Upgrade_0_35_0,
-	upgrades.Upgrade_1_0_0,
-	upgrades.Upgrade_1_0_1,
-	upgrades.Upgrade_1_1_0,
-	upgrades.Upgrade_1_2_0,
-	upgrades.Upgrade_2_0_0,
-	upgrades.Upgrade_2_1_0,
-	upgrades.Upgrade_2_1_1,
-	upgrades.Upgrade_2_1_3,
-	upgrades.Upgrade_2_2_0,
-	upgrades.Upgrade_2_4_0,
-	upgrades.Upgrade_2_5_0,
-	upgrades.Upgrade_3_0_0,
-	upgrades.Upgrade_3_0_1,
 	upgrades.Upgrade_3_1_0,
 }
 

diff --git a/app/upgrades/empty_upgrades.go b/app/upgrades/empty_upgrades.go
@@ -4,19 +4,8 @@ import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
-	"github.com/cosmos/cosmos-sdk/x/group"
-	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
-	icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
-	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
 	"github.com/lavanet/lava/v3/app/keepers"
-	v1 "github.com/lavanet/lava/v3/x/downtime/v1"
-	dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types"
-	fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types"
-	protocoltypes "github.com/lavanet/lava/v3/x/protocol/types"
-	rewardstypes "github.com/lavanet/lava/v3/x/rewards/types"
 )
 
 func defaultUpgradeHandler(
@@ -45,256 +34,6 @@ func defaultUpgradeHandler(
 // 	},
 // }
 
-var Upgrade_0_22_0 = Upgrade{
-	UpgradeName:          "v0.22.0",
-	CreateUpgradeHandler: v0_22_0_UpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-func v0_22_0_UpgradeHandler(
-	m *module.Manager,
-	c module.Configurator,
-	bapm BaseAppParamManager,
-	lk *keepers.LavaKeepers,
-) upgradetypes.UpgradeHandler {
-	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		lk.DowntimeKeeper.SetParams(ctx, v1.DefaultParams())
-		lk.ProtocolKeeper.SetParams(ctx, protocoltypes.DefaultParams())
-		return m.RunMigrations(ctx, c, vm)
-	}
-}
-
-var Upgrade_0_23_0 = Upgrade{
-	UpgradeName:          "v0.23.0",
-	CreateUpgradeHandler: v0_23_0_UpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{Added: []string{dualstakingtypes.StoreKey}},
-}
-
-func v0_23_0_UpgradeHandler(
-	m *module.Manager,
-	c module.Configurator,
-	bapm BaseAppParamManager,
-	lk *keepers.LavaKeepers,
-) upgradetypes.UpgradeHandler {
-	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		lk.PairingKeeper.InitProviderQoS(ctx, *fixationtypes.DefaultGenesis())
-		return m.RunMigrations(ctx, c, vm)
-	}
-}
-
-var Upgrade_0_23_2 = Upgrade{
-	UpgradeName:          "v0.23.2",             // upgrade name
-	CreateUpgradeHandler: defaultUpgradeHandler, // upgrade handler (default)
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_23_4 = Upgrade{
-	UpgradeName:          "v0.23.4",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_23_5 = Upgrade{
-	UpgradeName:          "v0.23.5",
-	CreateUpgradeHandler: v0_23_0_UpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{Added: []string{dualstakingtypes.StoreKey}},
-}
-
-var Upgrade_0_24_0 = Upgrade{
-	UpgradeName:          "v0.24.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_25_0 = Upgrade{
-	UpgradeName:          "v0.25.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_25_1 = Upgrade{
-	UpgradeName:          "v0.25.1",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_25_2 = Upgrade{
-	UpgradeName:          "v0.25.2",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_26_0 = Upgrade{
-	UpgradeName:          "v0.26.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_26_1 = Upgrade{
-	UpgradeName:          "v0.26.1",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_26_2 = Upgrade{
-	UpgradeName:          "v0.26.2",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_27_0 = Upgrade{
-	UpgradeName:          "v0.27.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_30_0 = Upgrade{
-	UpgradeName:          "v0.30.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_30_1 = Upgrade{
-	UpgradeName:          "v0.30.1",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_30_2 = Upgrade{
-	UpgradeName:          "v0.30.2",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_31_0 = Upgrade{
-	UpgradeName:          "v0.31.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_31_1 = Upgrade{
-	UpgradeName:          "v0.31.1",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_32_0 = Upgrade{
-	UpgradeName:          "v0.32.0",
-	CreateUpgradeHandler: v0_32_0_UpgradeHandler,
-	StoreUpgrades: store.StoreUpgrades{
-		Added:   []string{rewardstypes.StoreKey},
-		Deleted: []string{minttypes.StoreKey},
-	},
-}
-
-var Upgrade_0_32_3 = Upgrade{
-	UpgradeName:          "v0.32.3",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_33_0 = Upgrade{
-	UpgradeName:          "v0.33.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_0_34_0 = Upgrade{
-	UpgradeName:          "v0.34.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades: store.StoreUpgrades{
-		Added: []string{icahosttypes.StoreKey, icacontrollertypes.StoreKey},
-	},
-}
-
-var Upgrade_0_35_0 = Upgrade{
-	UpgradeName:          "v0.35.0",
-	CreateUpgradeHandler: v_35_0,
-	StoreUpgrades:        store.StoreUpgrades{Added: []string{authzkeeper.StoreKey, group.StoreKey}},
-}
-
-var Upgrade_1_0_0 = Upgrade{
-	UpgradeName:          "v1.0.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_1_0_1 = Upgrade{
-	UpgradeName:          "v1.0.1",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_1_1_0 = Upgrade{
-	UpgradeName:          "v1.1.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_1_2_0 = Upgrade{
-	UpgradeName:          "v1.2.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_2_0_0 = Upgrade{
-	UpgradeName:          "v2.0.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades: store.StoreUpgrades{
-		Added: []string{packetforwardtypes.StoreKey},
-	},
-}
-
-var Upgrade_2_1_0 = Upgrade{
-	UpgradeName:          "v2.1.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_2_1_1 = Upgrade{
-	UpgradeName:          "v2.1.1",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_2_1_3 = Upgrade{
-	UpgradeName:          "v2.1.3",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_2_2_0 = Upgrade{
-	UpgradeName:          "v2.2.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades: store.StoreUpgrades{
-		Added: []string{packetforwardtypes.StoreKey},
-	},
-}
-
-var Upgrade_2_4_0 = Upgrade{
-	UpgradeName:          "v2.4.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_2_5_0 = Upgrade{
-	UpgradeName:          "v2.5.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_3_0_0 = Upgrade{
-	UpgradeName:          "v3.0.0",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
-var Upgrade_3_0_1 = Upgrade{
-	UpgradeName:          "v3.0.1",
-	CreateUpgradeHandler: defaultUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
-
 var Upgrade_3_1_0 = Upgrade{
 	UpgradeName:          "v3.1.0",
 	CreateUpgradeHandler: defaultUpgradeHandler,