Merge branch 'main' into PRT-remove-spam-logs-on-consumer-side

lavanet · Aug 28, 2024 · 2e95cdb · 2e95cdb
2 parents 4243930 + 21fb8a7
commit 2e95cdb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/app/app.go b/app/app.go
@@ -200,6 +200,8 @@ var Upgrades = []upgrades.Upgrade{
 	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,
 }
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals

diff --git a/app/upgrades/empty_upgrades.go b/app/upgrades/empty_upgrades.go
@@ -282,3 +282,15 @@ var Upgrade_2_5_0 = Upgrade{
 	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{},
+}
diff --git a/x/protocol/module.go b/x/protocol/module.go
@@ -214,10 +214,18 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 		// panic:ok: at start up, migration cannot proceed anyhow
 		panic(fmt.Errorf("%s: failed to register migration to v19: %w", types.ModuleName, err))
 	}
+	if err := cfg.RegisterMigration(types.ModuleName, 19, migrator.MigrateVersion); err != nil {
+		// panic:ok: at start up, migration cannot proceed anyhow
+		panic(fmt.Errorf("%s: failed to register migration to v20: %w", types.ModuleName, err))
+	}
+	if err := cfg.RegisterMigration(types.ModuleName, 20, migrator.MigrateVersion); err != nil {
+		// panic:ok: at start up, migration cannot proceed anyhow
+		panic(fmt.Errorf("%s: failed to register migration to v21: %w", types.ModuleName, err))
+	}
 }
 
 // ConsensusVersion implements ConsensusVersion.
-func (AppModule) ConsensusVersion() uint64 { return 19 }
+func (AppModule) ConsensusVersion() uint64 { return 21 }
 
 // RegisterInvariants registers the capability module's invariants.
 func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {}

diff --git a/x/protocol/types/params.go b/x/protocol/types/params.go
@@ -12,7 +12,7 @@ import (
 var _ paramtypes.ParamSet = (*Params)(nil)
 
 const (
-	TARGET_VERSION = "2.4.0"
+	TARGET_VERSION = "3.0.1"
 	MIN_VERSION    = "2.2.2"
 )